* It appears that sometimes some IClientAPI reference is not being released, resulting in continual execution of the CheckConnectivity timer method

* For now, just turn off this timer when we close the connection
* Also some minor help refactoring creeps in to this revision.

2 files changed, 31 insertions, 0 deletions

diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 89fd77d..b9610e0 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -245,6 +245,7 @@ namespace OpenSim.Framework.Console
             try
             {
                 string line = System.Console.ReadLine();
+                
                 while (line == null)
                 {
                     line = System.Console.ReadLine();
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 33081b9..abc2bc1 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -201,6 +201,8 @@ namespace OpenSim.Framework.Servers
             {
                 case "help":
                     Notice("");
+                    // TODO: help on commands not yet implemented
+                    //Notice("help [command] - display general help or specific command help.");
                     Notice("quit - equivalent to shutdown.");
 
                     Notice("set log level [level] - change the console logging level only.  For example, off or debug.");
@@ -253,6 +255,34 @@ namespace OpenSim.Framework.Servers
 
                 SetConsoleLogLevel(setParams);
             }
+        }    
+        
+        /// <summary>
+        /// Show help information
+        /// </summary>
+        /// <param name="helpArgs"></param>
+        public virtual void ShowHelp(string[] helpArgs)
+        {
+            if (helpArgs.Length == 0)
+            {
+                Notice("");
+                // TODO: not yet implemented
+                //Notice("help [command] - display general help or specific command help.  Try help help for more info.");
+                Notice("quit - equivalent to shutdown.");
+
+                Notice("set log level [level] - change the console logging level only.  For example, off or debug."); 
+                Notice("show info - show server information (e.g. startup path).");
+
+                if (m_stats != null)
+                    Notice("show stats - show statistical information for this server");
+
+                Notice("show threads - list tracked threads");
+                Notice("show uptime - show server startup time and uptime.");
+                Notice("show version - show server version.");
+                Notice("shutdown - shutdown the server.\n");
+                
+                return;
+            }
         }
 
         /// <summary>