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

3 files changed, 13 insertions, 48 deletions

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 7087cb0..60c130f 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -1045,6 +1045,19 @@ namespace OpenSim
                         MainConsole.Instance.Output("Shared Module: " + module.Name);
                     }
 
+                    m_sceneManager.ForEachScene(
+                        delegate(Scene scene)
+                        {
+                            m_log.Error("The currently loaded modules in " + scene.RegionInfo.RegionName + " are:");
+                            foreach (IRegionModule module in scene.Modules.Values)
+                            {
+                                if (!module.IsSharedModule)
+                                {
+                                    m_log.Error("Region Module: " + module.Name);
+                                }
+                            }
+                        });
+
                     MainConsole.Instance.Output("");
                     break;
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 7a5160c..e054f1b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4028,33 +4028,6 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        public override void Show(string[] showParams)
-        {
-            base.Show(showParams);
-
-            switch (showParams[0])
-            {
-                case "users":
-                    m_log.Error("Current Region: " + RegionInfo.RegionName);
-                    m_log.ErrorFormat("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}{6,-16}", "Firstname", "Lastname",
-                                      "Agent ID", "Session ID", "Circuit", "IP", "World");
-
-                    ForEachScenePresence(delegate(ScenePresence sp)
-                    {
-                        m_log.ErrorFormat("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}",
-                                          sp.Firstname,
-                                          sp.Lastname,
-                                          sp.UUID,
-                                          sp.ControllingClient.AgentId,
-                                          "Unknown",
-                                          "Unknown",
-                                          RegionInfo.RegionName);
-                    });
-
-                    break;
-            }
-        }
-
         #region Script Handling Methods
 
         /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index ec94f10..dee2ecb 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -456,27 +456,6 @@ namespace OpenSim.Region.Framework.Scenes
         #endregion
         
         /// <summary>
-        /// Shows various details about the sim based on the parameters supplied by the console command in openSimMain.
-        /// </summary>
-        /// <param name="showParams">What to show</param>
-        public virtual void Show(string[] showParams)
-        {
-            switch (showParams[0])
-            {
-                case "modules":
-                    m_log.Error("The currently loaded modules in " + RegionInfo.RegionName + " are:");
-                    foreach (IRegionModule module in Modules.Values)
-                    {
-                        if (!module.IsSharedModule)
-                        {
-                            m_log.Error("Region Module: " + module.Name);
-                        }
-                    }
-                    break;
-            }
-        }
-
-        /// <summary>
         /// Call this from a region module to add a command to the OpenSim console.
         /// </summary>
         /// <param name="mod"></param>