aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/CreateCommsManager
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/ApplicationPlugins/CreateCommsManager')
-rw-r--r--OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs15
1 files changed, 2 insertions, 13 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index 6a66116..0f827b0 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -69,7 +69,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
69 69
70 protected CommunicationsManager m_commsManager; 70 protected CommunicationsManager m_commsManager;
71 protected GridInfoService m_gridInfoService; 71 protected GridInfoService m_gridInfoService;
72 protected IHyperlink HGServices = null;
73 72
74 protected IRegionCreator m_regionCreator; 73 protected IRegionCreator m_regionCreator;
75 74
@@ -144,7 +143,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
144 // We are in grid mode 143 // We are in grid mode
145 InitialiseHGGridServices(libraryRootFolder); 144 InitialiseHGGridServices(libraryRootFolder);
146 } 145 }
147 HGCommands.HGServices = HGServices;
148 } 146 }
149 147
150 protected void InitialiseStandardServices(LibraryRootFolder libraryRootFolder) 148 protected void InitialiseStandardServices(LibraryRootFolder libraryRootFolder)
@@ -187,19 +185,12 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
187 } 185 }
188 186
189 protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder) 187 protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder)
190 { 188 {
191 HGGridServicesStandalone gridService
192 = new HGGridServicesStandalone(
193 m_openSim.NetServersInfo, m_httpServer, m_openSim.SceneManager);
194
195 m_commsManager 189 m_commsManager
196 = new HGCommunicationsStandalone( 190 = new HGCommunicationsStandalone(
197 m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, 191 m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer,
198 gridService, 192 libraryRootFolder, false);
199 libraryRootFolder, false);
200 193
201 HGServices = gridService;
202
203 CreateGridInfoService(); 194 CreateGridInfoService();
204 } 195 }
205 196
@@ -210,8 +201,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
210 m_openSim.NetServersInfo, 201 m_openSim.NetServersInfo,
211 m_openSim.SceneManager, libraryRootFolder); 202 m_openSim.SceneManager, libraryRootFolder);
212 203
213 HGServices = ((HGCommunicationsGridMode) m_commsManager).HGServices;
214
215 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); 204 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
216 m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); 205 m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim));
217 if (m_openSim.userStatsURI != String.Empty) 206 if (m_openSim.userStatsURI != String.Empty)