1 files changed, 21 insertions, 16 deletions

diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index 57c109e..42eeb6c 100644
--- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -50,6 +50,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);                
 
         private Scene m_scene;
+        private ICommandConsole m_console;
 
         public string Name { get { return "Object Commands Module"; } }
         
@@ -75,36 +76,40 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 //            m_log.DebugFormat("[OBJECT COMMANDS MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
 
             m_scene = scene;
-        }
-
-        public void RemoveRegion(Scene scene)
-        {
-//            m_log.DebugFormat("[OBJECTS COMMANDS MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
-        }
+            m_console = MainConsole.Instance;
 
-        public void RegionLoaded(Scene scene)
-        {
-//            m_log.DebugFormat("[OBJECTS COMMANDS MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
-
-            MainConsole.Instance.Commands.AddCommand("region", false, "delete object owner",
+            m_console.Commands.AddCommand("region", false, "delete object owner",
                                           "delete object owner <UUID>",
                                           "Delete object by owner", HandleDeleteObject);
-            MainConsole.Instance.Commands.AddCommand("region", false, "delete object creator",
+            m_console.Commands.AddCommand("region", false, "delete object creator",
                                           "delete object creator <UUID>",
                                           "Delete object by creator", HandleDeleteObject);
-            MainConsole.Instance.Commands.AddCommand("region", false, "delete object uuid",
+            m_console.Commands.AddCommand("region", false, "delete object uuid",
                                           "delete object uuid <UUID>",
                                           "Delete object by uuid", HandleDeleteObject);
-            MainConsole.Instance.Commands.AddCommand("region", false, "delete object name",
+            m_console.Commands.AddCommand("region", false, "delete object name",
                                           "delete object name <name>",
                                           "Delete object by name", HandleDeleteObject);
-            MainConsole.Instance.Commands.AddCommand("region", false, "delete object outside",
+            m_console.Commands.AddCommand("region", false, "delete object outside",
                                           "delete object outside",
                                           "Delete all objects outside boundaries", HandleDeleteObject);
         }
 
+        public void RemoveRegion(Scene scene)
+        {
+//            m_log.DebugFormat("[OBJECTS COMMANDS MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+//            m_log.DebugFormat("[OBJECTS COMMANDS MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
+        }
+
         private void HandleDeleteObject(string module, string[] cmd)
         {
+            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
+                return;
+
             if (cmd.Length < 3)
                 return;
 
@@ -198,7 +203,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 
             foreach (SceneObjectGroup g in deletes)
             {
-                MainConsole.Instance.OutputFormat("Deleting object {0}", g.UUID);
+                m_console.OutputFormat("Deleting object {0}", g.UUID);
                 m_scene.DeleteSceneObject(g, false);
             }
         }