aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMW2009-03-02 11:21:18 +0000
committerMW2009-03-02 11:21:18 +0000
commit1dcbea0144a61c37527c3a925d6a586f76daecab (patch)
tree45766b6faf96b351c2f690e9ab9aa008e37b34c3 /OpenSim
parentAfter another heroic and bloody battle, OpenSim Dino Expedition 1, killed off... (diff)
downloadopensim-SC_OLD-1dcbea0144a61c37527c3a925d6a586f76daecab.zip
opensim-SC_OLD-1dcbea0144a61c37527c3a925d6a586f76daecab.tar.gz
opensim-SC_OLD-1dcbea0144a61c37527c3a925d6a586f76daecab.tar.bz2
opensim-SC_OLD-1dcbea0144a61c37527c3a925d6a586f76daecab.tar.xz
Removed the commented out InitialiseStandaloneServices and InitialiseGridServices (which are now preformed in CreateCommsManagerPlugin) methods from OpenSimBase and HGOpenSimNode. As if we decided to swap back to the old methods we can always re-add them, rather than leave them commented out.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Application/HGOpenSimNode.cs52
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs51
2 files changed, 0 insertions, 103 deletions
diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs
index b0be40d..44c1602 100644
--- a/OpenSim/Region/Application/HGOpenSimNode.cs
+++ b/OpenSim/Region/Application/HGOpenSimNode.cs
@@ -73,58 +73,6 @@ namespace OpenSim
73 73
74 } 74 }
75 75
76 //protected override void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder)
77 //{
78 // // Standalone mode
79
80 // HGInventoryService inventoryService = new HGInventoryService(m_networkServersInfo.InventoryURL, null, false);
81 // inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource);
82
83 // LocalUserServices userService =
84 // new LocalUserServices(
85 // m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService);
86 // userService.AddPlugin(m_configSettings.StandaloneUserPlugin, m_configSettings.StandaloneUserSource);
87
88 // //LocalBackEndServices backendService = new LocalBackEndServices();
89 // HGGridServicesStandalone gridService = new HGGridServicesStandalone(m_networkServersInfo, m_httpServer, m_assetCache, m_sceneManager);
90
91 // LocalLoginService loginService =
92 // new LocalLoginService(
93 // userService, m_configSettings.StandaloneWelcomeMessage, inventoryService, gridService.LocalBackend, m_networkServersInfo,
94 // m_configSettings.StandaloneAuthenticate, libraryRootFolder);
95
96
97 // m_commsManager = new HGCommunicationsStandalone(m_networkServersInfo, m_httpServer, m_assetCache,
98 // userService, userService, inventoryService, gridService, userService, libraryRootFolder, m_configSettings.DumpAssetsToFile);
99
100 // inventoryService.UserProfileCache = m_commsManager.UserProfileCacheService;
101 // HGServices = gridService;
102
103 // // set up XMLRPC handler for client's initial login request message
104 // m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
105
106 // // provides the web form login
107 // m_httpServer.AddHTTPHandler("login", loginService.ProcessHTMLLogin);
108
109 // // Provides the LLSD login
110 // m_httpServer.SetDefaultLLSDHandler(loginService.LLSDLoginMethod);
111
112 // // provide grid info
113 // // m_gridInfoService = new GridInfoService(m_config.Source.Configs["Startup"].GetString("inifile", Path.Combine(Util.configDir(), "OpenSim.ini")));
114 // m_gridInfoService = new GridInfoService(m_config.Source);
115 // m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod);
116 // m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod));
117 //}
118
119 //protected override void InitialiseGridServices(LibraryRootFolder libraryRootFolder)
120 //{
121 // m_commsManager = new HGCommunicationsGridMode(m_networkServersInfo, m_httpServer, m_assetCache, m_sceneManager, libraryRootFolder);
122
123 // HGServices = ((HGCommunicationsGridMode)m_commsManager).HGServices;
124
125 // m_httpServer.AddStreamHandler(new SimStatusHandler());
126 //}
127
128 protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, 76 protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager,
129 AgentCircuitManager circuitManager) 77 AgentCircuitManager circuitManager)
130 { 78 {
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 5927c5c..8021b8f 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -274,57 +274,6 @@ namespace OpenSim
274 m_console.Notice(moduleCommander.Help); 274 m_console.Notice(moduleCommander.Help);
275 } 275 }
276 276
277 ///// <summary>
278 ///// Initialises the backend services for standalone mode, and registers some http handlers
279 ///// </summary>
280 ///// <param name="libraryRootFolder"></param>
281 //protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder)
282 //{
283 // LocalInventoryService inventoryService = new LocalInventoryService();
284 // inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource);
285
286 // LocalUserServices userService =
287 // new LocalUserServices(
288 // m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService);
289 // userService.AddPlugin(m_configSettings.StandaloneUserPlugin, m_configSettings.StandaloneUserSource);
290
291 // LocalBackEndServices backendService = new LocalBackEndServices();
292
293 // LocalLoginService loginService =
294 // new LocalLoginService(
295 // userService, m_configSettings.StandaloneWelcomeMessage, inventoryService, backendService, m_networkServersInfo,
296 // m_configSettings.StandaloneAuthenticate, libraryRootFolder);
297
298 // m_commsManager
299 // = new CommunicationsLocal(
300 // m_networkServersInfo, m_httpServer, m_assetCache, userService, userService,
301 // inventoryService, backendService, userService,
302 // libraryRootFolder, m_configSettings.DumpAssetsToFile);
303
304 // // set up XMLRPC handler for client's initial login request message
305 // m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
306
307 // // provides the web form login
308 // m_httpServer.AddHTTPHandler("login", loginService.ProcessHTMLLogin);
309
310 // // Provides the LLSD login
311 // m_httpServer.SetDefaultLLSDHandler(loginService.LLSDLoginMethod);
312
313 // // provide grid info
314 // // m_gridInfoService = new GridInfoService(m_config.Source.Configs["Startup"].GetString("inifile", Path.Combine(Util.configDir(), "OpenSim.ini")));
315 // m_gridInfoService = new GridInfoService(m_config.Source);
316 // m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod);
317 // m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod));
318 //}
319
320 //protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder)
321 //{
322 // m_commsManager
323 // = new CommunicationsOGS1(m_networkServersInfo, m_httpServer, m_assetCache, libraryRootFolder);
324
325 // m_httpServer.AddStreamHandler(new SimStatusHandler());
326 //}
327
328 protected override void Initialize() 277 protected override void Initialize()
329 { 278 {
330 // 279 //