* Fixes endless loop in the Land Module when selecting any object.

* Fixes returning objects when the object owner hasn't been in the simulator since the simulator started up last.

1 files changed, 11 insertions, 10 deletions

diff --git a/OpenSim/Region/Environment/Scenes/EventManager.cs b/OpenSim/Region/Environment/Scenes/EventManager.cs
index 6c714f8..a3f5d2f 100644
--- a/OpenSim/Region/Environment/Scenes/EventManager.cs
+++ b/OpenSim/Region/Environment/Scenes/EventManager.cs
@@ -438,6 +438,16 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
+        public void TriggerObjectBeingRemovedFromScene(SceneObjectGroup obj)
+        {
+            handlerObjectBeingRemovedFromScene = OnObjectBeingRemovedFromScene;
+            if (handlerObjectBeingRemovedFromScene != null)
+            {
+                handlerObjectBeingRemovedFromScene(obj);
+
+            }
+        }
+
         public void TriggerShutdown()
         {
             handlerShutdown = OnShutdown;
@@ -725,16 +735,7 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
-        public void TriggerObjectBeingRemovedFromScene(SceneObjectGroup obj)
-        {
-            handlerObjectBeingRemovedFromScene = OnObjectBeingRemovedFromScene;
-            if (handlerObjectBeingRemovedFromScene != null)
-            {
-                handlerObjectBeingRemovedFromScene(obj);
-
-            }
-        }
-
+ 
 
         public void TriggerRequestParcelPrimCountUpdate()
         {