* Complete refactoring accidentally left unfinished so that all server help requests flow through the ShowHelp() method

2 files changed, 16 insertions, 9 deletions

diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index c73facb..c64c74e 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -150,15 +150,19 @@ namespace OpenSim.Grid.MessagingServer
 
             switch (cmd)
             {
-                case "help":
-                    m_console.Notice("clear-cache - Clears region cache.  Should be done when regions change position.  The region cache gets stale after a while.");
-                    break;
                 case "clear-cache":
                     int entries = msgsvc.ClearRegionCache();
                     m_console.Notice("Region cache cleared! Cleared " + entries.ToString() + " entries");
                     break;
             }
         }
+        
+        protected override void ShowHelp(string[] helpArgs)
+        {
+            base.ShowHelp(helpArgs);
+            
+            m_console.Notice("clear-cache - Clears region cache.  Should be done when regions change position.  The region cache gets stale after a while.");
+        }
 
         public override void Shutdown()
         {
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 94e0728..0a64925 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -227,12 +227,6 @@ namespace OpenSim.Grid.UserServer
 
             switch (cmd)
             {
-                case "help":
-                    m_console.Notice("create user - create a new user");
-                    m_console.Notice(
-                        "logoff-user <firstname> <lastname> <message> - logs off the specified user from the grid");
-                    break;
-
                 case "create":
                     do_create(cmdparams[0]);
                     break;
@@ -309,6 +303,15 @@ namespace OpenSim.Grid.UserServer
                     break;
             }
         }
+        
+        protected override void ShowHelp(string[] helpArgs)
+        {
+            base.ShowHelp(helpArgs);  
+
+            m_console.Notice("create user - create a new user");
+            m_console.Notice(
+                "logoff-user <firstname> <lastname> <message> - logs off the specified user from the grid");
+        }
 
         public override void Shutdown()
         {