aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/CreateCommsManager
diff options
context:
space:
mode:
authorMelanie Thielker2009-07-10 02:22:26 +0000
committerMelanie Thielker2009-07-10 02:22:26 +0000
commitc310fb11f492419de60b4bf8e5bb234e4589b336 (patch)
treea7bccfad7cde51ec830fdad59d5729091b2e69ae /OpenSim/ApplicationPlugins/CreateCommsManager
parentCreate a MainServer static class to access the regions server's HTTP server (diff)
downloadopensim-SC-c310fb11f492419de60b4bf8e5bb234e4589b336.zip
opensim-SC-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.gz
opensim-SC-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.bz2
opensim-SC-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.xz
Remove all references to HttpServer from CommsManager (all incarnations)
Change all uses of the HttpServer properties to use the new singleton
Diffstat (limited to 'OpenSim/ApplicationPlugins/CreateCommsManager')
-rw-r--r--OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index d56a9d9..4d6467a 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -168,8 +168,8 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
168 { 168 {
169 m_commsManager 169 m_commsManager
170 = new CommunicationsLocal( 170 = new CommunicationsLocal(
171 m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, 171 m_openSim.ConfigurationSettings, m_openSim.NetServersInfo,
172 libraryRootFolder, false); 172 libraryRootFolder);
173 173
174 CreateGridInfoService(); 174 CreateGridInfoService();
175 } 175 }
@@ -177,7 +177,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
177 protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder) 177 protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder)
178 { 178 {
179 m_commsManager 179 m_commsManager
180 = new CommunicationsOGS1(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, libraryRootFolder); 180 = new CommunicationsOGS1(m_openSim.NetServersInfo, libraryRootFolder);
181 181
182 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); 182 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
183 m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); 183 m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim));
@@ -206,8 +206,8 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
206 { 206 {
207 m_commsManager 207 m_commsManager
208 = new HGCommunicationsGridMode( 208 = new HGCommunicationsGridMode(
209 m_openSim.NetServersInfo, m_httpServer, 209 m_openSim.NetServersInfo,
210 m_openSim.AssetCache, m_openSim.SceneManager, libraryRootFolder); 210 m_openSim.SceneManager, libraryRootFolder);
211 211
212 HGServices = ((HGCommunicationsGridMode) m_commsManager).HGServices; 212 HGServices = ((HGCommunicationsGridMode) m_commsManager).HGServices;
213 213