Fix multiple moving_end and add moving_start to llSetKeyframedMotion
Signed-off-by: Melanie Thielker <melanie@t-data.com>0.8.2-post-fixes
parent
028506cf3c
commit
e1a455eae5
|
@ -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,20 +635,24 @@ 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>();
|
||||||
|
// foreach (IScriptModule m in scriptModules)
|
||||||
|
// {
|
||||||
|
// if (m == null)
|
||||||
|
// continue;
|
||||||
|
// m.PostObjectEvent(m_group.RootPart.UUID, "moving_end", new object[0]);
|
||||||
|
// }
|
||||||
|
|
||||||
IScriptModule[] scriptModules = scene.RequestModuleInterfaces<IScriptModule>();
|
m_group.Scene.EventManager.TriggerMovingEndEvent(m_group.RootPart.LocalId);
|
||||||
foreach (IScriptModule m in scriptModules)
|
|
||||||
{
|
|
||||||
if (m == null)
|
|
||||||
continue;
|
|
||||||
m.PostObjectEvent(m_group.RootPart.UUID, "moving_end", new object[0]);
|
|
||||||
}
|
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue