Merge branch 'master' into bigmerge

Conflicts:
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

1 files changed, 0 insertions, 21 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index bf861b8..73e9392 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -458,27 +458,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>