Merge branch 'refs/heads/Timeline-local' into TimelineUber

1 files changed, 4 insertions, 1 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index cf9bace6..14c5f1c8 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -33,7 +33,8 @@
                         "timebar" : {"#": "time_bar"},
                         "container_tracks" : {"#" : "container-tracks"},
                         "end_hottext" : {"@" : "endHottext"},
-                        "container_layers" : {"#" : "container-layers"}
+                        "container_layers" : {"#" : "container-layers"},
+                        "timeline_disabler" : {"#" : "timeline-disabler"}
                     }
                 },
 
@@ -189,6 +190,8 @@
                         </div>
                     </div>
                 </div>
+
+                                <div class="timeline-disabled" id="timeline-disabler"></div>
                 
             </div>
         </div>