1 files changed, 0 insertions, 56 deletions

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 04ff4e6..56ad5c9 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -409,10 +409,6 @@ namespace OpenSim
             m_console.Commands.AddCommand("General", false, "modules unload",
                                           "modules unload <name>",
                                           "Unload a module", HandleModules);
-
-            m_console.Commands.AddCommand("Objects", false, "kill uuid",
-                                          "kill uuid <UUID>",
-                                          "Kill an object by UUID", KillUUID);
         }
 
         public override void ShutdownSpecific()
@@ -1309,58 +1305,6 @@ namespace OpenSim
             return result;
         }
 
-        /// <summary>
-        /// Kill an object given its UUID.
-        /// </summary>
-        /// <param name="cmdparams"></param>
-        protected void KillUUID(string module, string[] cmdparams)
-        {
-            if (cmdparams.Length > 2)
-            {
-                UUID id = UUID.Zero;
-                SceneObjectGroup grp = null;
-                Scene sc = null;
-
-                if (!UUID.TryParse(cmdparams[2], out id))
-                {
-                    MainConsole.Instance.Output("[KillUUID]: Error bad UUID format!");
-                    return;
-                }
-
-                m_sceneManager.ForEachScene(
-                    delegate(Scene scene)
-                    {
-                        SceneObjectPart part = scene.GetSceneObjectPart(id);
-                        if (part == null)
-                            return;
-
-                        grp = part.ParentGroup;
-                        sc = scene;
-                    });
-
-                if (grp == null)
-                {
-                    MainConsole.Instance.Output(String.Format("[KillUUID]: Given UUID {0} not found!", id));
-                }
-                else
-                {
-                    MainConsole.Instance.Output(String.Format("[KillUUID]: Found UUID {0} in scene {1}", id, sc.RegionInfo.RegionName));
-                    try
-                    {
-                        sc.DeleteSceneObject(grp, false);
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.ErrorFormat("[KillUUID]: Error while removing objects from scene: " + e);
-                    }
-                }
-            }
-            else
-            {
-                MainConsole.Instance.Output("[KillUUID]: Usage: kill uuid <UUID>");
-            }
-        }
-
         #endregion
     }
 }