diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/KeyframeMotion.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs index cdd8d2d..e4aa196 100644 --- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs +++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | |||
@@ -140,7 +140,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
140 | timer.Start(); | 140 | timer.Start(); |
141 | }; | 141 | }; |
142 | } | 142 | } |
143 | 143 | ||
144 | // Check again, in case the regions were started while we were adding the event handler | 144 | // Check again, in case the regions were started while we were adding the event handler |
145 | if (SceneManager.Instance.AllRegionsReady) | 145 | if (SceneManager.Instance.AllRegionsReady) |
146 | { | 146 | { |
@@ -821,7 +821,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
821 | 821 | ||
822 | SceneObjectGroup tmp = m_group; | 822 | SceneObjectGroup tmp = m_group; |
823 | m_group = null; | 823 | m_group = null; |
824 | 824 | ||
825 | using (MemoryStream ms = new MemoryStream()) | 825 | using (MemoryStream ms = new MemoryStream()) |
826 | { | 826 | { |
827 | BinaryFormatter fmt = new BinaryFormatter(); | 827 | BinaryFormatter fmt = new BinaryFormatter(); |
@@ -839,10 +839,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
839 | public void StartCrossingCheck() | 839 | public void StartCrossingCheck() |
840 | { | 840 | { |
841 | // timer will be restart by crossingFailure | 841 | // timer will be restart by crossingFailure |
842 | // or never since crossing worked and this | 842 | // or never since crossing worked and this |
843 | // should be deleted | 843 | // should be deleted |
844 | StopTimer(); | 844 | StopTimer(); |
845 | 845 | ||
846 | m_isCrossing = true; | 846 | m_isCrossing = true; |
847 | m_waitingCrossing = true; | 847 | m_waitingCrossing = true; |
848 | 848 | ||