From 1eee525c886f55e63a1d6ebf6ba224a73d4c4178 Mon Sep 17 00:00:00 2001 From: Melanie Date: Fri, 8 Jun 2012 16:54:47 +0200 Subject: [PATCH] Revert "Add a frame based watchdog function to keyframed motion" This reverts commit 2d98d6354ce04b655e8d9062a209f5af1565c78c. --- .../Region/Framework/Scenes/KeyframeMotion.cs | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs index 0219d9ca0c..b7b0d27388 100644 --- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs +++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs @@ -64,10 +64,6 @@ namespace OpenSim.Region.Framework.Scenes [NonSerialized()] protected Timer m_timer = new Timer(); - [NonSerialized()] - protected bool m_frameHooked; - [NonSerialized()] - protected int frameCount = 0; [NonSerialized()] private SceneObjectGroup m_group; @@ -166,22 +162,6 @@ namespace OpenSim.Region.Framework.Scenes if (m_keyframes.Length > 0) m_timer.Start(); m_running = true; - if (!m_frameHooked) - { - m_group.Scene.EventManager.OnFrame += OnFrame; - m_frameHooked = true; - } - } - - private void OnFrame() - { - frameCount++; - if (frameCount >= 30) - { - frameCount = 0; - if (m_running) - Start(); - } } public void Stop()