aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs15
1 files changed, 10 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 93cc0a7..f1ff08f 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -178,10 +178,7 @@ namespace OpenSim
178 else 178 else
179 { 179 {
180 // We are in grid mode 180 // We are in grid mode
181 m_commsManager 181 InitialiseGridServices(libraryRootFolder);
182 = new CommunicationsOGS1(m_networkServersInfo, m_httpServer, m_assetCache, libraryRootFolder);
183
184 m_httpServer.AddStreamHandler(new SimStatusHandler());
185 } 182 }
186 183
187 proxyUrl = ConfigSource.Source.Configs["Network"].GetString("proxy_url", ""); 184 proxyUrl = ConfigSource.Source.Configs["Network"].GetString("proxy_url", "");
@@ -200,7 +197,7 @@ namespace OpenSim
200 /// Initialises the backend services for standalone mode, and registers some http handlers 197 /// Initialises the backend services for standalone mode, and registers some http handlers
201 /// </summary> 198 /// </summary>
202 /// <param name="libraryRootFolder"></param> 199 /// <param name="libraryRootFolder"></param>
203 protected void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder) 200 protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder)
204 { 201 {
205 LocalInventoryService inventoryService = new LocalInventoryService(); 202 LocalInventoryService inventoryService = new LocalInventoryService();
206 inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource); 203 inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource);
@@ -239,6 +236,14 @@ namespace OpenSim
239 m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod)); 236 m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod));
240 } 237 }
241 238
239 protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder)
240 {
241 m_commsManager
242 = new CommunicationsOGS1(m_networkServersInfo, m_httpServer, m_assetCache, libraryRootFolder);
243
244 m_httpServer.AddStreamHandler(new SimStatusHandler());
245 }
246
242 protected override void Initialize() 247 protected override void Initialize()
243 { 248 {
244 // 249 //