aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2012-06-08 16:54:47 +0200
committerMelanie2012-06-08 16:54:47 +0200
commit1eee525c886f55e63a1d6ebf6ba224a73d4c4178 (patch)
tree7e0c57549ce1a703e44c0c1e367c35ab77ca8940
parentMerge branch 'ubitwork' into avination (diff)
downloadopensim-SC-1eee525c886f55e63a1d6ebf6ba224a73d4c4178.zip
opensim-SC-1eee525c886f55e63a1d6ebf6ba224a73d4c4178.tar.gz
opensim-SC-1eee525c886f55e63a1d6ebf6ba224a73d4c4178.tar.bz2
opensim-SC-1eee525c886f55e63a1d6ebf6ba224a73d4c4178.tar.xz
Revert "Add a frame based watchdog function to keyframed motion"
This reverts commit 2d98d6354ce04b655e8d9062a209f5af1565c78c.
-rw-r--r--OpenSim/Region/Framework/Scenes/KeyframeMotion.cs20
1 files changed, 0 insertions, 20 deletions
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
index 0219d9c..b7b0d27 100644
--- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -64,10 +64,6 @@ namespace OpenSim.Region.Framework.Scenes
64 64
65 [NonSerialized()] 65 [NonSerialized()]
66 protected Timer m_timer = new Timer(); 66 protected Timer m_timer = new Timer();
67 [NonSerialized()]
68 protected bool m_frameHooked;
69 [NonSerialized()]
70 protected int frameCount = 0;
71 67
72 [NonSerialized()] 68 [NonSerialized()]
73 private SceneObjectGroup m_group; 69 private SceneObjectGroup m_group;
@@ -166,22 +162,6 @@ namespace OpenSim.Region.Framework.Scenes
166 if (m_keyframes.Length > 0) 162 if (m_keyframes.Length > 0)
167 m_timer.Start(); 163 m_timer.Start();
168 m_running = true; 164 m_running = true;
169 if (!m_frameHooked)
170 {
171 m_group.Scene.EventManager.OnFrame += OnFrame;
172 m_frameHooked = true;
173 }
174 }
175
176 private void OnFrame()
177 {
178 frameCount++;
179 if (frameCount >= 30)
180 {
181 frameCount = 0;
182 if (m_running)
183 Start();
184 }
185 } 165 }
186 166
187 public void Stop() 167 public void Stop()