aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-01-11 05:12:01 +0000
committerMelanie2010-01-11 05:12:01 +0000
commitbfddd75ca8946360728787e56a81b2d0f4a880f6 (patch)
treec3eaf43df49488f43b13b2974bca3ee601040545
parentRefactor. Move MainServer init to a place with greener grass (diff)
downloadopensim-SC_OLD-bfddd75ca8946360728787e56a81b2d0f4a880f6.zip
opensim-SC_OLD-bfddd75ca8946360728787e56a81b2d0f4a880f6.tar.gz
opensim-SC_OLD-bfddd75ca8946360728787e56a81b2d0f4a880f6.tar.bz2
opensim-SC_OLD-bfddd75ca8946360728787e56a81b2d0f4a880f6.tar.xz
Refactor. Instantiate sim status handlers in opensim base, not in a plugin
-rw-r--r--OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs4
-rw-r--r--OpenSim/Region/Application/OpenSim.cs5
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
135 protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder) 135 protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder)
136 { 136 {
137 137
138 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
139 m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim));
140 if (m_openSim.userStatsURI != String.Empty)
141 m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim));
142 } 138 }
143 139
144 private void CreateGridInfoService() 140 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
148 148
149 RegisterConsoleCommands(); 149 RegisterConsoleCommands();
150 150
151 MainServer.Instance.AddStreamHandler(new OpenSim.SimStatusHandler());
152 MainServer.Instance.AddStreamHandler(new OpenSim.XSimStatusHandler(this));
153 if (userStatsURI != String.Empty)
154 MainServer.Instance.AddStreamHandler(new OpenSim.UXSimStatusHandler(this));
155
151 base.StartupSpecific(); 156 base.StartupSpecific();
152 157
153 if (m_console is RemoteConsole) 158 if (m_console is RemoteConsole)