Refactor. Instantiate sim status handlers in opensim base, not in a plugin

2 files changed, 5 insertions, 4 deletions

diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index 74f11a4..3cd02f4 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -135,10 +135,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
         protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder)
         {
 
-            m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
-            m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim));
-            if (m_openSim.userStatsURI != String.Empty)
-                m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim));
         }
 
         private void CreateGridInfoService()
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 31cc610..aedf21e 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -148,6 +148,11 @@ namespace OpenSim
 
             RegisterConsoleCommands();
 
+            MainServer.Instance.AddStreamHandler(new OpenSim.SimStatusHandler());
+            MainServer.Instance.AddStreamHandler(new OpenSim.XSimStatusHandler(this));
+            if (userStatsURI != String.Empty)
+                MainServer.Instance.AddStreamHandler(new OpenSim.UXSimStatusHandler(this));
+
             base.StartupSpecific();
 
             if (m_console is RemoteConsole)