aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJeff Kelley2015-08-13 10:13:01 +0200
committerMelanie Thielker2015-08-20 00:24:14 +0200
commite1a455eae56b08cf37f972af9f702788851cecdc (patch)
treeb240764606e31a4ae07dfead05d5d322c7ae2ffa
parentPartial plumbing for the agent stateful module features negotiation (diff)
downloadopensim-SC_OLD-e1a455eae56b08cf37f972af9f702788851cecdc.zip
opensim-SC_OLD-e1a455eae56b08cf37f972af9f702788851cecdc.tar.gz
opensim-SC_OLD-e1a455eae56b08cf37f972af9f702788851cecdc.tar.bz2
opensim-SC_OLD-e1a455eae56b08cf37f972af9f702788851cecdc.tar.xz
Fix multiple moving_end and add moving_start to llSetKeyframedMotion
Signed-off-by: Melanie Thielker <melanie@t-data.com>
-rw-r--r--OpenSim/Region/Framework/Scenes/KeyframeMotion.cs25
1 files changed, 15 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
index b4a171f..646403f 100644
--- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -454,6 +454,7 @@ namespace OpenSim.Region.Framework.Scenes
454 { 454 {
455 StartTimer(); 455 StartTimer();
456 m_running = true; 456 m_running = true;
457 m_group.Scene.EventManager.TriggerMovingStartEvent(m_group.RootPart.LocalId);
457 } 458 }
458 else 459 else
459 { 460 {
@@ -634,21 +635,25 @@ namespace OpenSim.Region.Framework.Scenes
634 635
635 if (m_frames.Count == 0) 636 if (m_frames.Count == 0)
636 { 637 {
638 if (!m_running) return;
639
637 GetNextList(); 640 GetNextList();
638 641
639 if (m_frames.Count == 0) 642 if (m_frames.Count == 0)
640 { 643 {
641 Stop(); 644 Stop();
642 Scene scene = m_group.Scene; 645// Scene scene = m_group.Scene;
643 646//
644 IScriptModule[] scriptModules = scene.RequestModuleInterfaces<IScriptModule>(); 647// IScriptModule[] scriptModules = scene.RequestModuleInterfaces<IScriptModule>();
645 foreach (IScriptModule m in scriptModules) 648// foreach (IScriptModule m in scriptModules)
646 { 649// {
647 if (m == null) 650// if (m == null)
648 continue; 651// continue;
649 m.PostObjectEvent(m_group.RootPart.UUID, "moving_end", new object[0]); 652// m.PostObjectEvent(m_group.RootPart.UUID, "moving_end", new object[0]);
650 } 653// }
651 654
655 m_group.Scene.EventManager.TriggerMovingEndEvent(m_group.RootPart.LocalId);
656
652 return; 657 return;
653 } 658 }
654 659