OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork' into avination

avinationmerge
Melanie 2012-06-08 15:15:17 +02:00
parent 22906386b4 2d98d6354c
commit dadac6816b
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
View File

@ -64,6 +64,10 @@ namespace OpenSim.Region.Framework.Scenes
[NonSerialized()] [NonSerialized()]
protected Timer m_timer = new Timer(); protected Timer m_timer = new Timer();
[NonSerialized()]
protected bool m_frameHooked;
[NonSerialized()]
protected int frameCount = 0;
[NonSerialized()] [NonSerialized()]
private SceneObjectGroup m_group; private SceneObjectGroup m_group;
@ -162,6 +166,22 @@ namespace OpenSim.Region.Framework.Scenes
if (m_keyframes.Length > 0) if (m_keyframes.Length > 0)
m_timer.Start(); m_timer.Start();
m_running = true; 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() public void Stop()