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

Fix multiple moving_end and add moving_start to llSetKeyframedMotion 

Signed-off-by: Melanie Thielker <melanie@t-data.com>
0.8.2-post-fixes
Jeff Kelley 2015-08-13 10:13:01 +02:00 committed by Melanie Thielker
parent 028506cf3c
commit e1a455eae5
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -454,6 +454,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
StartTimer(); StartTimer();
m_running = true; m_running = true;
m_group.Scene.EventManager.TriggerMovingStartEvent(m_group.RootPart.LocalId);
} }
else else
{ {
@ -634,21 +635,25 @@ namespace OpenSim.Region.Framework.Scenes
if (m_frames.Count == 0) if (m_frames.Count == 0)
{ {
if (!m_running) return;
GetNextList(); GetNextList();
if (m_frames.Count == 0) if (m_frames.Count == 0)
{ {
Stop(); Stop();
Scene scene = m_group.Scene; // Scene scene = m_group.Scene;
//
IScriptModule[] scriptModules = scene.RequestModuleInterfaces<IScriptModule>(); // IScriptModule[] scriptModules = scene.RequestModuleInterfaces<IScriptModule>();
foreach (IScriptModule m in scriptModules) // foreach (IScriptModule m in scriptModules)
{ // {
if (m == null) // if (m == null)
continue; // continue;
m.PostObjectEvent(m_group.RootPart.UUID, "moving_end", new object[0]); // m.PostObjectEvent(m_group.RootPart.UUID, "moving_end", new object[0]);
} // }
m_group.Scene.EventManager.TriggerMovingEndEvent(m_group.RootPart.LocalId);
return; return;
} }