Changed "show users" command to display only root agents, "show users full" to

display root and child agents (mantis #2171).

3 files changed, 7 insertions, 7 deletions

diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 767740b..69c7bc1 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -372,7 +372,7 @@ namespace OpenSim.Framework.Console
         // Shows data about something
         public void ShowCommands(string ShowWhat)
         {
-            m_cmdParser.Show(ShowWhat);
+            m_cmdParser.Show(new string[] { ShowWhat });
         }
 
         public void Prompt()
diff --git a/OpenSim/Framework/Console/ConsoleCallbacksBase.cs b/OpenSim/Framework/Console/ConsoleCallbacksBase.cs
index 8505eea..d37c47a 100644
--- a/OpenSim/Framework/Console/ConsoleCallbacksBase.cs
+++ b/OpenSim/Framework/Console/ConsoleCallbacksBase.cs
@@ -30,6 +30,6 @@ namespace OpenSim.Framework.Console
     public interface conscmd_callback
     {
         void RunCmd(string cmd, string[] cmdparams);
-        void Show(string ShowWhat);
+        void Show(string[] showParams);
     }
 }
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 794dbd8..e149a35 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -254,7 +254,7 @@ namespace OpenSim.Framework.Servers
                 case "show":
                     if (cmdparams.Length > 0)
                     {
-                        Show(cmdparams[0]);
+                        Show(cmdparams);
                     }
                     break;
 
@@ -317,12 +317,12 @@ namespace OpenSim.Framework.Servers
         /// <summary>
         /// Outputs to the console information about the region
         /// </summary>
-        /// <param name="showWhat">
-        /// What information to display (valid arguments are "uptime", "users")
+        /// <param name="showParams">
+        /// What information to display (valid arguments are "uptime", "users", ...)
         /// </param>
-        public virtual void Show(string showWhat)
+        public virtual void Show(string[] showParams)
         {
-            switch (showWhat)
+            switch (showParams[0])
             {
                 case "info":
                     Notice("Version: " + m_version);