diff options
Diffstat (limited to 'OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs')
-rw-r--r-- | OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs index 6a66116..cd93bea 100644 --- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs +++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | |||
@@ -144,7 +144,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager | |||
144 | // We are in grid mode | 144 | // We are in grid mode |
145 | InitialiseHGGridServices(libraryRootFolder); | 145 | InitialiseHGGridServices(libraryRootFolder); |
146 | } | 146 | } |
147 | HGCommands.HGServices = HGServices; | ||
148 | } | 147 | } |
149 | 148 | ||
150 | protected void InitialiseStandardServices(LibraryRootFolder libraryRootFolder) | 149 | protected void InitialiseStandardServices(LibraryRootFolder libraryRootFolder) |
@@ -188,18 +187,11 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager | |||
188 | 187 | ||
189 | protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder) | 188 | protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder) |
190 | { | 189 | { |
191 | HGGridServicesStandalone gridService | ||
192 | = new HGGridServicesStandalone( | ||
193 | m_openSim.NetServersInfo, m_httpServer, m_openSim.SceneManager); | ||
194 | |||
195 | m_commsManager | 190 | m_commsManager |
196 | = new HGCommunicationsStandalone( | 191 | = new HGCommunicationsStandalone( |
197 | m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, | 192 | m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, |
198 | gridService, | ||
199 | libraryRootFolder, false); | 193 | libraryRootFolder, false); |
200 | 194 | ||
201 | HGServices = gridService; | ||
202 | |||
203 | CreateGridInfoService(); | 195 | CreateGridInfoService(); |
204 | } | 196 | } |
205 | 197 | ||
@@ -210,8 +202,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager | |||
210 | m_openSim.NetServersInfo, | 202 | m_openSim.NetServersInfo, |
211 | m_openSim.SceneManager, libraryRootFolder); | 203 | m_openSim.SceneManager, libraryRootFolder); |
212 | 204 | ||
213 | HGServices = ((HGCommunicationsGridMode) m_commsManager).HGServices; | ||
214 | |||
215 | m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); | 205 | m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); |
216 | m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); | 206 | m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); |
217 | if (m_openSim.userStatsURI != String.Empty) | 207 | if (m_openSim.userStatsURI != String.Empty) |