Revert "Merge master into teravuswork", it should have been avination, not master.

This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.

1 files changed, 93 insertions, 429 deletions

diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index ab8f143..09f6758 100644
--- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -27,12 +27,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Xml;
 using log4net;
 using Mono.Addins;
 using NDesk.Options;
@@ -43,7 +40,6 @@ using OpenSim.Framework.Console;
 using OpenSim.Framework.Monitoring;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Scenes.Serialization;
 
 namespace OpenSim.Region.CoreModules.World.Objects.Commands
 {
@@ -87,85 +83,52 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             m_console.Commands.AddCommand(
                 "Objects", false, "delete object owner",
                 "delete object owner <UUID>",
-                "Delete scene objects by owner",
-                "Command will ask for confirmation before proceeding.",
-                HandleDeleteObject);
+                "Delete a scene object by owner", HandleDeleteObject);
 
             m_console.Commands.AddCommand(
                 "Objects", false, "delete object creator",
                 "delete object creator <UUID>",
-                "Delete scene objects by creator",
-                "Command will ask for confirmation before proceeding.",
-                HandleDeleteObject);
+                "Delete a scene object by creator", HandleDeleteObject);
 
             m_console.Commands.AddCommand(
-                "Objects", false, "delete object id",
-                "delete object id <UUID-or-localID>",
-                "Delete a scene object by uuid or localID",
-                HandleDeleteObject);
+                "Objects", false, "delete object uuid",
+                "delete object uuid <UUID>",
+                "Delete a scene object by uuid", HandleDeleteObject);
 
             m_console.Commands.AddCommand(
                 "Objects", false, "delete object name",
                 "delete object name [--regex] <name>",
                 "Delete a scene object by name.",
-                "Command will ask for confirmation before proceeding.\n"
-                  + "If --regex is specified then the name is treatead as a regular expression",
+                "If --regex is specified then the name is treatead as a regular expression",
                 HandleDeleteObject);
 
             m_console.Commands.AddCommand(
                 "Objects", false, "delete object outside",
                 "delete object outside",
-                "Delete all scene objects outside region boundaries",
-                "Command will ask for confirmation before proceeding.",
-                HandleDeleteObject);
+                "Delete all scene objects outside region boundaries", HandleDeleteObject);
 
             m_console.Commands.AddCommand(
                 "Objects",
                 false,
-                "delete object pos",
-                "delete object pos <start-coord> to <end-coord>",
-                "Delete scene objects within the given area.",
-                ConsoleUtil.CoordHelp,
-                HandleDeleteObject);
-
-            m_console.Commands.AddCommand(
-                "Objects",
-                false,
-                "show object id",
-                "show object id [--full] <UUID-or-localID>",
-                "Show details of a scene object with the given UUID or localID",
-                "The --full option will print out information on all the parts of the object.\n"
-                    + "For yet more detailed part information, use the \"show part\" commands.",
-                HandleShowObjectById);
+                "show object uuid",
+                "show object uuid <UUID>",
+                "Show details of a scene object with the given UUID", HandleShowObjectByUuid);
 
             m_console.Commands.AddCommand(
                 "Objects",
                 false,
                 "show object name",
-                "show object name [--full] [--regex] <name>",
+                "show object name [--regex] <name>",
                 "Show details of scene objects with the given name.",
-                "The --full option will print out information on all the parts of the object.\n"
-                    + "For yet more detailed part information, use the \"show part\" commands.\n"
-                    + "If --regex is specified then the name is treatead as a regular expression.",
+                "If --regex is specified then the name is treatead as a regular expression",
                 HandleShowObjectByName);
 
             m_console.Commands.AddCommand(
                 "Objects",
                 false,
-                "show object pos",
-                "show object pos [--full] <start-coord> to <end-coord>",
-                "Show details of scene objects within the given area.",
-                "The --full option will print out information on all the parts of the object.\n"
-                    + "For yet more detailed part information, use the \"show part\" commands.\n"
-                    + ConsoleUtil.CoordHelp,
-                HandleShowObjectByPos);
-
-            m_console.Commands.AddCommand(
-                "Objects",
-                false,
-                "show part id",
-                "show part id <UUID-or-localID>",
-                "Show details of a scene object part with the given UUID or localID", HandleShowPartById);
+                "show part uuid",
+                "show part uuid <UUID>",
+                "Show details of a scene object parts with the given UUID", HandleShowPartByUuid);
 
             m_console.Commands.AddCommand(
                 "Objects",
@@ -173,28 +136,8 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 "show part name",
                 "show part name [--regex] <name>",
                 "Show details of scene object parts with the given name.",
-                "If --regex is specified then the name is treated as a regular expression",
+                "If --regex is specified then the name is treatead as a regular expression",
                 HandleShowPartByName);
-
-            m_console.Commands.AddCommand(
-                "Objects",
-                false,
-                "show part pos",
-                "show part pos <start-coord> to <end-coord>",
-                "Show details of scene object parts within the given area.",
-                ConsoleUtil.CoordHelp,
-                HandleShowPartByPos);
-
-            m_console.Commands.AddCommand(
-                "Objects",
-                false,
-                "dump object id",
-                "dump object id <UUID-or-localID>",
-                "Dump the formatted serialization of the given object to the file <UUID>.xml",
-                "e.g. dump object uuid c1ed6809-cc24-4061-a4c2-93082a2d1f1d will dump serialization to c1ed6809-cc24-4061-a4c2-93082a2d1f1d.xml\n"
-                    + "To locate the UUID or localID in the first place, you need to use the other show object commands.\n"
-                    + "If a local ID is given then the filename used is still that for the UUID",
-                HandleDumpObjectById);
         }
 
         public void RemoveRegion(Scene scene)
@@ -207,75 +150,25 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 //            m_log.DebugFormat("[OBJECTS COMMANDS MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
         }
 
-        /// <summary>
-        /// Outputs the sogs to console.
-        /// </summary>
-        /// <param name='searchPredicate'></param>
-        /// <param name='showFull'>If true then output all part details.  If false then output summary.</param>
-        private void OutputSogsToConsole(Predicate<SceneObjectGroup> searchPredicate, bool showFull)
-        {
-            List<SceneObjectGroup> sceneObjects = m_scene.GetSceneObjectGroups().FindAll(searchPredicate);
-
-            StringBuilder sb = new StringBuilder();
-
-            foreach (SceneObjectGroup so in sceneObjects)
-            {
-                AddSceneObjectReport(sb, so, showFull);
-                sb.Append("\n");
-            }
-
-            sb.AppendFormat("{0} object(s) found in {1}\n", sceneObjects.Count, m_scene.Name);
-
-            m_console.OutputFormat(sb.ToString());
-        }
-
-        private void OutputSopsToConsole(Predicate<SceneObjectPart> searchPredicate, bool showFull)
-        {
-            List<SceneObjectGroup> sceneObjects = m_scene.GetSceneObjectGroups();
-            List<SceneObjectPart> parts = new List<SceneObjectPart>();
-
-            sceneObjects.ForEach(so => parts.AddRange(Array.FindAll<SceneObjectPart>(so.Parts, searchPredicate)));
-
-            StringBuilder sb = new StringBuilder();
-
-            foreach (SceneObjectPart part in parts)
-            {
-                AddScenePartReport(sb, part, showFull);
-                sb.Append("\n");
-            }
-
-            sb.AppendFormat("{0} parts found in {1}\n", parts.Count, m_scene.Name);
-
-            m_console.OutputFormat(sb.ToString());
-        }
-
-        private void HandleShowObjectById(string module, string[] cmdparams)
+        private void HandleShowObjectByUuid(string module, string[] cmd)
         {
             if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
                 return;
 
-            bool showFull = false;
-            OptionSet options = new OptionSet().Add("full", v => showFull = v != null );
-
-            List<string> mainParams = options.Parse(cmdparams);
-
-            if (mainParams.Count < 4)
+            if (cmd.Length < 4)
             {
                 m_console.OutputFormat("Usage: show object uuid <uuid>");
                 return;
             }
 
-            UUID uuid;
-            uint localId;
-            if (!ConsoleUtil.TryParseConsoleId(m_console, mainParams[3], out uuid, out localId))
+            UUID objectUuid;
+            if (!UUID.TryParse(cmd[3], out objectUuid))
+            {
+                m_console.OutputFormat("{0} is not a valid uuid", cmd[3]);
                 return;
+            }
 
-            SceneObjectGroup so;
-
-            if (localId != ConsoleUtil.LocalIdNotFound)
-                so = m_scene.GetSceneObjectGroup(localId);
-            else
-                so = m_scene.GetSceneObjectGroup(uuid);
+            SceneObjectGroup so = m_scene.GetSceneObjectGroup(objectUuid);
 
             if (so == null)
             {
@@ -284,7 +177,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             }
 
             StringBuilder sb = new StringBuilder();
-            AddSceneObjectReport(sb, so, showFull);
+            AddSceneObjectReport(sb, so);
 
             m_console.OutputFormat(sb.ToString());
         }
@@ -294,91 +187,70 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
                 return;
 
-            bool showFull = false;
             bool useRegex = false;
-            OptionSet options = new OptionSet();
-            options.Add("full", v => showFull = v != null );
-            options.Add("regex", v => useRegex = v != null );
+            OptionSet options = new OptionSet().Add("regex", v=> useRegex = v != null );
 
             List<string> mainParams = options.Parse(cmdparams);
 
             if (mainParams.Count < 4)
             {
-                m_console.OutputFormat("Usage: show object name [--full] [--regex] <name>");
+                m_console.OutputFormat("Usage: show object name [--regex] <name>");
                 return;
             }
 
             string name = mainParams[3];
 
-            Predicate<SceneObjectGroup> searchPredicate;
+            List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
+            Action<SceneObjectGroup> searchAction;
 
             if (useRegex)
             {
                 Regex nameRegex = new Regex(name);
-                searchPredicate = so => nameRegex.IsMatch(so.Name);
+                searchAction = so => { if (nameRegex.IsMatch(so.Name)) { sceneObjects.Add(so); }};
             }
             else
             {
-                searchPredicate = so => so.Name == name;
+                searchAction = so => { if (so.Name == name) { sceneObjects.Add(so); }};
             }
 
-            OutputSogsToConsole(searchPredicate, showFull);
-        }
-
-        private void HandleShowObjectByPos(string module, string[] cmdparams)
-        {
-            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
-                return;
-
-            bool showFull = false;
-            OptionSet options = new OptionSet().Add("full", v => showFull = v != null );
-
-            List<string> mainParams = options.Parse(cmdparams);
+            m_scene.ForEachSOG(searchAction);
 
-            if (mainParams.Count < 5)
+            if (sceneObjects.Count == 0)
             {
-                m_console.OutputFormat("Usage: show object pos [--full] <start-coord> to <end-coord>");
+                m_console.OutputFormat("No objects with name {0} found in {1}", name, m_scene.RegionInfo.RegionName);
                 return;
             }
 
-            Vector3 startVector, endVector;
-
-            if (!TryParseVectorRange(cmdparams.Skip(3).Take(3), out startVector, out endVector))
-                return;
+            StringBuilder sb = new StringBuilder();
 
-            Predicate<SceneObjectGroup> searchPredicate
-                = so => Util.IsInsideBox(so.AbsolutePosition, startVector, endVector);
+            foreach (SceneObjectGroup so in sceneObjects)
+            {
+                AddSceneObjectReport(sb, so);
+                sb.Append("\n");
+            }
 
-            OutputSogsToConsole(searchPredicate, showFull);
+            m_console.OutputFormat(sb.ToString());
         }
 
-        private void HandleShowPartById(string module, string[] cmdparams)
+        private void HandleShowPartByUuid(string module, string[] cmd)
         {
             if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
                 return;
 
-//            bool showFull = false;
-            OptionSet options = new OptionSet();
-//            options.Add("full", v => showFull = v != null );
-
-            List<string> mainParams = options.Parse(cmdparams);
-
-            if (mainParams.Count < 4)
+            if (cmd.Length < 4)
             {
-                m_console.OutputFormat("Usage: show part id [--full] <UUID-or-localID>");
+                m_console.OutputFormat("Usage: show part uuid <uuid>");
                 return;
             }
 
             UUID objectUuid;
-            uint localId;
-            if (!ConsoleUtil.TryParseConsoleId(m_console, mainParams[3], out objectUuid, out localId))
+            if (!UUID.TryParse(cmd[3], out objectUuid))
+            {
+                m_console.OutputFormat("{0} is not a valid uuid", cmd[3]);
                 return;
+            }
 
-            SceneObjectPart sop;
-            if (localId == ConsoleUtil.LocalIdNotFound)
-                sop = m_scene.GetSceneObjectPart(objectUuid);
-            else
-                sop = m_scene.GetSceneObjectPart(localId);
+            SceneObjectPart sop = m_scene.GetSceneObjectPart(objectUuid);
 
             if (sop == null)
             {
@@ -387,239 +259,84 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             }
 
             StringBuilder sb = new StringBuilder();
-            AddScenePartReport(sb, sop, true);
+            AddScenePartReport(sb, sop);
 
             m_console.OutputFormat(sb.ToString());
         }
 
-        private void HandleShowPartByPos(string module, string[] cmdparams)
-        {
-            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
-                return;
-
-//            bool showFull = false;
-            OptionSet options = new OptionSet();
-//            options.Add("full", v => showFull = v != null );
-
-            List<string> mainParams = options.Parse(cmdparams);
-
-            if (mainParams.Count < 5)
-            {
-                m_console.OutputFormat("Usage: show part pos [--full] <start-coord> to <end-coord>");
-                return;
-            }
-
-            string rawConsoleStartVector = mainParams[3];
-            Vector3 startVector;
-
-            if (!ConsoleUtil.TryParseConsoleMinVector(rawConsoleStartVector, out startVector))
-            {
-                m_console.OutputFormat("Error: Start vector {0} does not have a valid format", rawConsoleStartVector);
-                return;
-            }
-
-            string rawConsoleEndVector = mainParams[5];
-            Vector3 endVector;
-
-            if (!ConsoleUtil.TryParseConsoleMaxVector(rawConsoleEndVector, out endVector))
-            {
-                m_console.OutputFormat("Error: End vector {0} does not have a valid format", rawConsoleEndVector);
-                return;
-            }
-
-            OutputSopsToConsole(sop => Util.IsInsideBox(sop.AbsolutePosition, startVector, endVector), true);
-        }
-
         private void HandleShowPartByName(string module, string[] cmdparams)
         {
             if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
                 return;
 
-//            bool showFull = false;
             bool useRegex = false;
-            OptionSet options = new OptionSet();
-//            options.Add("full", v => showFull = v != null );
-            options.Add("regex", v => useRegex = v != null );
+            OptionSet options = new OptionSet().Add("regex", v=> useRegex = v != null );
 
             List<string> mainParams = options.Parse(cmdparams);
 
             if (mainParams.Count < 4)
             {
-                m_console.OutputFormat("Usage: show part name [--full] [--regex] <name>");
+                m_console.OutputFormat("Usage: show part name [--regex] <name>");
                 return;
             }
 
             string name = mainParams[3];
 
-            Predicate<SceneObjectPart> searchPredicate;
+            List<SceneObjectPart> parts = new List<SceneObjectPart>();
+
+            Action<SceneObjectGroup> searchAction;
 
             if (useRegex)
             {
                 Regex nameRegex = new Regex(name);
-                searchPredicate = sop => nameRegex.IsMatch(sop.Name);
+                searchAction = so => so.ForEachPart(sop => { if (nameRegex.IsMatch(sop.Name)) { parts.Add(sop); } });
             }
             else
             {
-                searchPredicate = sop => sop.Name == name;
+                searchAction = so => so.ForEachPart(sop => { if (sop.Name == name) { parts.Add(sop); } });
             }
 
-            OutputSopsToConsole(searchPredicate, true);
-        }
-
-        private void HandleDumpObjectById(string module, string[] cmdparams)
-        {
-            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
-                return;
+            m_scene.ForEachSOG(searchAction);
 
-            if (cmdparams.Length < 4)
+            if (parts.Count == 0)
             {
-                m_console.OutputFormat("Usage: dump object id <UUID-or-localID>");
+                m_console.OutputFormat("No parts with name {0} found in {1}", name, m_scene.RegionInfo.RegionName);
                 return;
             }
 
-            UUID objectUuid;
-            uint localId;
-            if (!ConsoleUtil.TryParseConsoleId(m_console, cmdparams[3], out objectUuid, out localId))
-                return;
-
-            SceneObjectGroup so;
-            if (localId == ConsoleUtil.LocalIdNotFound)
-                so = m_scene.GetSceneObjectGroup(objectUuid);
-            else
-                so = m_scene.GetSceneObjectGroup(localId);
+            StringBuilder sb = new StringBuilder();
 
-            if (so == null)
+            foreach (SceneObjectPart part in parts)
             {
-//                m_console.OutputFormat("No part found with uuid {0}", objectUuid);
-                return;
+                AddScenePartReport(sb, part);
+                sb.Append("\n");
             }
 
-            // In case we found it via local ID.
-            objectUuid = so.UUID;
-
-            string fileName = string.Format("{0}.xml", objectUuid);
-
-            if (!ConsoleUtil.CheckFileDoesNotExist(m_console, fileName))
-                return;
-            
-            using (XmlTextWriter xtw = new XmlTextWriter(fileName, Encoding.UTF8))
-            {
-                xtw.Formatting = Formatting.Indented;
-                SceneObjectSerializer.ToOriginalXmlFormat(so, xtw, true);
-            }
-            
-            m_console.OutputFormat("Object dumped to file {0}", fileName);
+            m_console.OutputFormat(sb.ToString());
         }
 
-        /// <summary>
-        /// Append a scene object report to an input StringBuilder
-        /// </summary>
-        /// <returns></returns>
-        /// <param name='sb'></param>
-        /// <param name='so'</param>
-        /// <param name='showFull'>
-        /// If true then information on all parts of an object is appended.
-        /// If false then only summary information about an object is appended.
-        /// </param>
-        private StringBuilder AddSceneObjectReport(StringBuilder sb, SceneObjectGroup so, bool showFull)
+        private StringBuilder AddSceneObjectReport(StringBuilder sb, SceneObjectGroup so)
         {
-            if (showFull)
-            {
-                foreach (SceneObjectPart sop in so.Parts)
-                {
-                    AddScenePartReport(sb, sop, false);
-                    sb.Append("\n");
-                }
-            }
-            else
-            {
-                AddSummarySceneObjectReport(sb, so);
-            }
+            sb.AppendFormat("Name:        {0}\n", so.Name);
+            sb.AppendFormat("Description: {0}\n", so.Description);
+            sb.AppendFormat("Location:    {0} @ {1}\n", so.AbsolutePosition, so.Scene.RegionInfo.RegionName);
+            sb.AppendFormat("Parts:       {0}\n", so.PrimCount);
+            sb.AppendFormat("Flags:       {0}\n", so.RootPart.Flags);
 
             return sb;
         }
 
-        private StringBuilder AddSummarySceneObjectReport(StringBuilder sb, SceneObjectGroup so)
-        {
-            ConsoleDisplayList cdl = new ConsoleDisplayList();
-            cdl.AddRow("Name", so.Name);
-            cdl.AddRow("Descrition", so.Description);
-            cdl.AddRow("Local ID", so.LocalId);
-            cdl.AddRow("UUID", so.UUID);
-            cdl.AddRow("Location", string.Format("{0} @ {1}", so.AbsolutePosition, so.Scene.Name));
-            cdl.AddRow("Parts", so.PrimCount);
-            cdl.AddRow("Flags", so.RootPart.Flags);
-
-            return sb.Append(cdl.ToString());
-        }
-
-        /// <summary>
-        /// Append a scene object part report to an input StringBuilder
-        /// </summary>
-        /// <returns></returns>
-        /// <param name='sb'></param>
-        /// <param name='sop'</param>
-        /// <param name='showFull'>
-        /// If true then information on each inventory item will be shown.
-        /// If false then only summary inventory information is shown.
-        /// </param>
-        private StringBuilder AddScenePartReport(StringBuilder sb, SceneObjectPart sop, bool showFull)
-        {
-            ConsoleDisplayList cdl = new ConsoleDisplayList();
-            cdl.AddRow("Name", sop.Name);
-            cdl.AddRow("Description", sop.Description);
-            cdl.AddRow("Local ID", sop.LocalId);
-            cdl.AddRow("UUID", sop.UUID);
-            cdl.AddRow("Location",  string.Format("{0} @ {1}", sop.AbsolutePosition, sop.ParentGroup.Scene.Name));
-            cdl.AddRow(
-                "Parent",
-                sop.IsRoot ? "Is Root" : string.Format("{0} {1}", sop.ParentGroup.Name, sop.ParentGroup.UUID));
-            cdl.AddRow("Link number", sop.LinkNum);
-            cdl.AddRow("Flags", sop.Flags);
-
-            object itemsOutput;
-            if (showFull)
-            {
-                StringBuilder itemsSb = new StringBuilder("\n");
-                itemsOutput = AddScenePartItemsReport(itemsSb, sop.Inventory).ToString();
-            }
-            else
-            {
-                itemsOutput = sop.Inventory.Count;
-            }
-
-
-            cdl.AddRow("Items", itemsOutput);
-
-            return sb.Append(cdl.ToString());
-        }
-
-        private StringBuilder AddScenePartItemsReport(StringBuilder sb, IEntityInventory inv)
+        private StringBuilder AddScenePartReport(StringBuilder sb, SceneObjectPart sop)
         {
-            ConsoleDisplayTable cdt = new ConsoleDisplayTable();
-            cdt.Indent = 2;
-
-            cdt.AddColumn("Name", 50);
-            cdt.AddColumn("Type", 12);
-            cdt.AddColumn("Running", 7);
-            cdt.AddColumn("Item UUID", 36);
-            cdt.AddColumn("Asset UUID", 36);
-
-            foreach (TaskInventoryItem item in inv.GetInventoryItems())
-            {
-                bool foundScriptInstance, scriptRunning;
-                foundScriptInstance
-                    = SceneObjectPartInventory.TryGetScriptInstanceRunning(m_scene, item, out scriptRunning);
-
-                cdt.AddRow(
-                    item.Name,
-                    ((InventoryType)item.InvType).ToString(),
-                    foundScriptInstance ? scriptRunning.ToString() : "n/a",
-                    item.ItemID.ToString(),
-                    item.AssetID.ToString());
-            }
+            sb.AppendFormat("Name:        {0}\n", sop.Name);
+            sb.AppendFormat("Description: {0}\n", sop.Description);
+            sb.AppendFormat("Location:    {0} @ {1}\n", sop.AbsolutePosition, sop.ParentGroup.Scene.RegionInfo.RegionName);
+            sb.AppendFormat("Parent:      {0}",
+                sop.IsRoot ? "Is Root\n" : string.Format("{0} {1}\n", sop.ParentGroup.Name, sop.ParentGroup.UUID));
+            sb.AppendFormat("Link number: {0}\n", sop.LinkNum);
+            sb.AppendFormat("Flags:       {0}\n", sop.Flags);
 
-            return sb.Append(cdt.ToString());
+            return sb;
         }
 
         private void HandleDeleteObject(string module, string[] cmd)
@@ -681,24 +398,19 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
         
                     break;
         
-                case "id":
-                    UUID uuid;
-                    uint localId;
-                    if (!ConsoleUtil.TryParseConsoleId(m_console, o, out uuid, out localId))
+                case "uuid":
+                    if (!UUID.TryParse(o, out match))
                         return;
 
                     requireConfirmation = false;
                     deletes = new List<SceneObjectGroup>();
-
-                    SceneObjectGroup so;
-                    if (localId == ConsoleUtil.LocalIdNotFound)
-                        so = m_scene.GetSceneObjectGroup(uuid);
-                    else
-                        so = m_scene.GetSceneObjectGroup(localId);
-
-                    if (!so.IsAttachment)
-                       deletes.Add(so);
-
+        
+                    m_scene.ForEachSOG(delegate (SceneObjectGroup g)
+                    {
+                        if (g.UUID == match && !g.IsAttachment)
+                            deletes.Add(g);
+                    });
+        
         //                if (deletes.Count == 0)
         //                    m_console.OutputFormat("No objects were found with uuid {0}", match);
         
@@ -738,10 +450,6 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
         
                     break;
 
-                case "pos":
-                    deletes = GetDeleteCandidatesByPos(module, cmd);
-                    break;
-
                 default:
                     m_console.OutputFormat("Unrecognized mode {0}", mode);
                     return;
@@ -756,7 +464,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                     string.Format(
                         "Are you sure that you want to delete {0} objects from {1}",
                         deletes.Count, m_scene.RegionInfo.RegionName),
-                    "y/N");
+                    "n");
     
                 if (response.ToLower() != "y")
                 {
@@ -778,6 +486,9 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 
         private List<SceneObjectGroup> GetDeleteCandidatesByName(string module, string[] cmdparams)
         {
+            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
+                return null;
+
             bool useRegex = false;
             OptionSet options = new OptionSet().Add("regex", v=> useRegex = v != null );
 
@@ -811,52 +522,5 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 
             return sceneObjects;
         }
-
-        /// <summary>
-        /// Get scene object delete candidates by position
-        /// </summary>
-        /// <param name='module'></param>
-        /// <param name='cmdparams'></param>
-        /// <returns>null if parsing failed on one of the arguments, otherwise a list of objects to delete.  If there
-        /// are no objects to delete then the list will be empty./returns>
-        private List<SceneObjectGroup> GetDeleteCandidatesByPos(string module, string[] cmdparams)
-        {
-            if (cmdparams.Length < 5)
-            {
-                m_console.OutputFormat("Usage: delete object pos <start-coord> to <end-coord>");
-                return null;
-            }
-
-            Vector3 startVector, endVector;
-
-            if (!TryParseVectorRange(cmdparams.Skip(3).Take(3), out startVector, out endVector))
-                return null;
-
-            return m_scene.GetSceneObjectGroups().FindAll(
-                so => !so.IsAttachment && Util.IsInsideBox(so.AbsolutePosition, startVector, endVector));
-        }
-
-        private bool TryParseVectorRange(IEnumerable<string> rawComponents, out Vector3 startVector, out Vector3 endVector)
-        {
-            string rawConsoleStartVector = rawComponents.Take(1).Single();
-
-            if (!ConsoleUtil.TryParseConsoleMinVector(rawConsoleStartVector, out startVector))
-            {
-                m_console.OutputFormat("Error: Start vector {0} does not have a valid format", rawConsoleStartVector);
-                endVector = Vector3.Zero;
-                
-                return false;
-            }
-
-            string rawConsoleEndVector = rawComponents.Skip(1).Take(1).Single();
-
-            if (!ConsoleUtil.TryParseConsoleMaxVector(rawConsoleEndVector, out endVector))
-            {
-                m_console.OutputFormat("Error: End vector {0} does not have a valid format", rawConsoleEndVector);
-                return false;
-            }
-
-            return true;
-        }
     }
 }
\ No newline at end of file