* Refactor additional stats collection common code into base opensim server

* If extra stats not sent to the viewer are available on an opensim server, they are now uniformly accessible using the 'show stats' command

2 files changed, 2 insertions, 15 deletions

diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index bae7819..e7386ff 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -391,7 +391,7 @@ namespace OpenSim
         {
             printAvailableVersionInformation();
             
-            StatsManager.StartCollectingSimExtraStats();
+            m_stats = StatsManager.StartCollectingSimExtraStats();
             
             // Do baseclass startup sequence: OpenSim.Region.ClientStack.RegionApplicationBase.StartUp
             // TerrainManager, StorageManager, HTTP Server
diff --git a/OpenSim/Region/Application/OpenSimMainConsole.cs b/OpenSim/Region/Application/OpenSimMainConsole.cs
index 39f2b7b..2381f57 100644
--- a/OpenSim/Region/Application/OpenSimMainConsole.cs
+++ b/OpenSim/Region/Application/OpenSimMainConsole.cs
@@ -252,8 +252,7 @@ namespace OpenSim
                     m_console.Notice("set-time [x] - set the current scene time phase");
                     m_console.Notice("show assets - show state of asset cache.");
                     m_console.Notice("show users - show info about connected users.");
-                    m_console.Notice("show modules - shows info about loaded modules.");
-                    m_console.Notice("show stats - statistical information for this server");
+                    m_console.Notice("show modules - shows info about loaded modules.");                    
                     m_console.Notice("show version - show the running build version.");
                     m_console.Notice("threads - list threads");
                     m_console.Notice("config set section field value - set a config value");
@@ -595,18 +594,6 @@ namespace OpenSim
                                              scene.RegionInfo.RegionLocY);
                         });
                     break;
-                                    
-                case "stats":
-                    if (StatsManager.SimExtraStats != null)
-                    {
-                        m_console.Notice(
-                            "STATS", Environment.NewLine + StatsManager.SimExtraStats.Report());                    
-                    }
-                    else
-                    {
-                        m_console.Notice("Extra sim statistics collection has not been enabled");
-                    }
-                    break;
 
                 case "version":
                     if (!string.IsNullOrEmpty(buildVersion))