From 30ffefb67bf3d74b6355113bc121437d0bdbba14 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 27 Mar 2009 20:41:35 +0000
Subject: * refactor: call some EventManager triggers directly rather than
 through scene

---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 968f94b..1834215 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2939,6 +2939,7 @@ namespace OpenSim.Region.Framework.Scenes
                             }
                         }
                     }
+                    
                     if (atTargets.Count > 0)
                     {
                         uint[] localids = new uint[0];
@@ -2952,16 +2953,20 @@ namespace OpenSim.Region.Framework.Scenes
                                 cntr++;
                             }
                         }
+                        
                         for (int ctr = 0; ctr < localids.Length; ctr++)
                         {
                             foreach (uint target in atTargets.Keys)
                             {
                                 scriptPosTarget att = atTargets[target];
-                                m_scene.TriggerAtTargetEvent(localids[ctr], att.handle, att.targetPos, m_rootPart.GroupPosition);
+                                m_scene.EventManager.TriggerAtTargetEvent(
+                                    localids[ctr], att.handle, att.targetPos, m_rootPart.GroupPosition);
                             }
                         }
+                        
                         return;
                     }
+                    
                     if (m_scriptListens_notAtTarget && !at_target)
                     {
                         //trigger not_at_target
@@ -2976,9 +2981,10 @@ namespace OpenSim.Region.Framework.Scenes
                                 cntr++;
                             }
                         }
+                        
                         for (int ctr = 0; ctr < localids.Length; ctr++)
                         {
-                            m_scene.TriggerNotAtTargetEvent(localids[ctr]);
+                            m_scene.EventManager.TriggerNotAtTargetEvent(localids[ctr]);
                         }
                     }
                 }
-- 
cgit v1.1