Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

2 files changed, 221 insertions, 17 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 8d41728..38a7805 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -348,7 +348,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             region.ExternalHostName = uri.Host;
             region.HttpPort = (uint)uri.Port;
-            region.ServerURI = uri.ToString();
+            region.ServerURI = aCircuit.ServiceURLs["HomeURI"].ToString();
             region.RegionName = string.Empty;
             region.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), (int)0);
             return region;
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index 57c109e..e3d04cd 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,6 +76,51 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 //            m_log.DebugFormat("[OBJECT COMMANDS MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
 
             m_scene = scene;
+            m_console = MainConsole.Instance;
+
+            m_console.Commands.AddCommand("region", false, "delete object owner",
+                                          "delete object owner <UUID>",
+                                          "Delete a scene object by owner", HandleDeleteObject);
+            m_console.Commands.AddCommand("region", false, "delete object creator",
+                                          "delete object creator <UUID>",
+                                          "Delete a scene object by creator", HandleDeleteObject);
+            m_console.Commands.AddCommand("region", false, "delete object uuid",
+                                          "delete object uuid <UUID>",
+                                          "Delete a scene object by uuid", HandleDeleteObject);
+            m_console.Commands.AddCommand("region", false, "delete object name",
+                                          "delete object name <name>",
+                                          "Delete a scene object by name", HandleDeleteObject);
+            m_console.Commands.AddCommand("region", false, "delete object outside",
+                                          "delete object outside",
+                                          "Delete all scene objects outside region boundaries", HandleDeleteObject);
+
+            m_console.Commands.AddCommand(
+                "region",
+                false,
+                "show object uuid",
+                "show object uuid <UUID>",
+                "Show details of a scene object with the given UUID", HandleShowObjectByUuid);
+
+            m_console.Commands.AddCommand(
+                "region",
+                false,
+                "show object name",
+                "show object name <name>",
+                "Show details of scene objects with the given name", HandleShowObjectByName);
+
+            m_console.Commands.AddCommand(
+                "region",
+                false,
+                "show part uuid",
+                "show part uuid <UUID>",
+                "Show details of a scene object parts with the given UUID", HandleShowPartByUuid);
+
+            m_console.Commands.AddCommand(
+                "region",
+                false,
+                "show part name",
+                "show part name <name>",
+                "Show details of scene object parts with the given name", HandleShowPartByName);
         }
 
         public void RemoveRegion(Scene scene)
@@ -85,26 +131,167 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
         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",
-                                          "delete object owner <UUID>",
-                                          "Delete object by owner", HandleDeleteObject);
-            MainConsole.Instance.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",
-                                          "delete object uuid <UUID>",
-                                          "Delete object by uuid", HandleDeleteObject);
-            MainConsole.Instance.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",
-                                          "delete object outside",
-                                          "Delete all objects outside boundaries", HandleDeleteObject);
+        private void HandleShowObjectByUuid(string module, string[] cmd)
+        {
+            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
+                return;
+
+            if (cmd.Length < 4)
+            {
+                m_console.OutputFormat("Usage: show object uuid <uuid>");
+                return;
+            }
+
+            UUID objectUuid;
+            if (!UUID.TryParse(cmd[3], out objectUuid))
+            {
+                m_console.OutputFormat("{0} is not a valid uuid", cmd[3]);
+                return;
+            }
+
+            SceneObjectGroup so = m_scene.GetSceneObjectGroup(objectUuid);
+
+            if (so == null)
+            {
+//                m_console.OutputFormat("No part found with uuid {0}", objectUuid);
+                return;
+            }
+
+            StringBuilder sb = new StringBuilder();
+            AddSceneObjectReport(sb, so);
+
+            m_console.OutputFormat(sb.ToString());
+        }
+
+        private void HandleShowObjectByName(string module, string[] cmd)
+        {
+            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
+                return;
+
+            if (cmd.Length < 4)
+            {
+                m_console.OutputFormat("Usage: show object name <name>");
+                return;
+            }
+
+            string name = cmd[3];
+
+            List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
+
+            m_scene.ForEachSOG(so => { if (so.Name == name) { sceneObjects.Add(so); }});
+
+            if (sceneObjects.Count == 0)
+            {
+                m_console.OutputFormat("No objects with name {0} found in {1}", name, m_scene.RegionInfo.RegionName);
+                return;
+            }
+
+            StringBuilder sb = new StringBuilder();
+
+            foreach (SceneObjectGroup so in sceneObjects)
+            {
+                AddSceneObjectReport(sb, so);
+                sb.Append("\n");
+            }
+
+            m_console.OutputFormat(sb.ToString());
+        }
+
+        private void HandleShowPartByUuid(string module, string[] cmd)
+        {
+            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
+                return;
+
+            if (cmd.Length < 4)
+            {
+                m_console.OutputFormat("Usage: show part uuid <uuid>");
+                return;
+            }
+
+            UUID objectUuid;
+            if (!UUID.TryParse(cmd[3], out objectUuid))
+            {
+                m_console.OutputFormat("{0} is not a valid uuid", cmd[3]);
+                return;
+            }
+
+            SceneObjectPart sop = m_scene.GetSceneObjectPart(objectUuid);
+
+            if (sop == null)
+            {
+//                m_console.OutputFormat("No part found with uuid {0}", objectUuid);
+                return;
+            }
+
+            StringBuilder sb = new StringBuilder();
+            AddScenePartReport(sb, sop);
+
+            m_console.OutputFormat(sb.ToString());
+        }
+
+        private void HandleShowPartByName(string module, string[] cmd)
+        {
+            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
+                return;
+
+            if (cmd.Length < 4)
+            {
+                m_console.OutputFormat("Usage: show part name <name>");
+                return;
+            }
+
+            string name = cmd[3];
+
+            List<SceneObjectPart> parts = new List<SceneObjectPart>();
+
+            m_scene.ForEachSOG(so => so.ForEachPart(sop => { if (sop.Name == name) { parts.Add(sop); } }));
+
+            if (parts.Count == 0)
+            {
+                m_console.OutputFormat("No parts with name {0} found in {1}", name, m_scene.RegionInfo.RegionName);
+                return;
+            }
+
+            StringBuilder sb = new StringBuilder();
+
+            foreach (SceneObjectPart part in parts)
+            {
+                AddScenePartReport(sb, part);
+                sb.Append("\n");
+            }
+
+            m_console.OutputFormat(sb.ToString());
+        }
+
+        private StringBuilder AddSceneObjectReport(StringBuilder sb, SceneObjectGroup 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);
+
+            return sb;
+        }
+
+        private StringBuilder AddScenePartReport(StringBuilder sb, SceneObjectPart sop)
+        {
+            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("Parts:       {0}\n", !sop.IsRoot ? "1" : sop.ParentGroup.PrimCount.ToString());;
+
+            return sb;
         }
 
         private void HandleDeleteObject(string module, string[] cmd)
         {
+            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
+                return;
+
             if (cmd.Length < 3)
                 return;
 
@@ -135,6 +322,9 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                         deletes.Add(g);
                 });
 
+//                if (deletes.Count == 0)
+//                    m_console.OutputFormat("No objects were found with owner {0}", match);
+
                 break;
 
             case "creator":
@@ -147,6 +337,9 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                         deletes.Add(g);
                 });
 
+//                if (deletes.Count == 0)
+//                    m_console.OutputFormat("No objects were found with creator {0}", match);
+
                 break;
 
             case "uuid":
@@ -159,6 +352,9 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                         deletes.Add(g);
                 });
 
+//                if (deletes.Count == 0)
+//                    m_console.OutputFormat("No objects were found with uuid {0}", match);
+
                 break;
 
             case "name":
@@ -168,6 +364,9 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                         deletes.Add(g);
                 });
 
+//                if (deletes.Count == 0)
+//                    m_console.OutputFormat("No objects were found with name {0}", o);
+
                 break;
 
             case "outside":
@@ -193,12 +392,17 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                         deletes.Add(g);
                 });
 
+//                if (deletes.Count == 0)
+//                    m_console.OutputFormat("No objects were found outside region bounds");
+
                 break;
             }
 
+            m_console.OutputFormat("Deleting {0} objects in {1}", deletes.Count, m_scene.RegionInfo.RegionName);
+
             foreach (SceneObjectGroup g in deletes)
             {
-                MainConsole.Instance.OutputFormat("Deleting object {0}", g.UUID);
+                m_console.OutputFormat("Deleting object {0} {1}", g.UUID, g.Name);
                 m_scene.DeleteSceneObject(g, false);
             }
         }