diff options
Diffstat (limited to 'OpenSim/Region/Application/HGOpenSimNode.cs')
| -rw-r--r-- | OpenSim/Region/Application/HGOpenSimNode.cs | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs index 1130c70..b0be40d 100644 --- a/OpenSim/Region/Application/HGOpenSimNode.cs +++ b/OpenSim/Region/Application/HGOpenSimNode.cs | |||
| @@ -73,57 +73,57 @@ namespace OpenSim | |||
| 73 | 73 | ||
| 74 | } | 74 | } |
| 75 | 75 | ||
| 76 | protected override void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder) | 76 | //protected override void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder) |
| 77 | { | 77 | //{ |
| 78 | // Standalone mode | 78 | // // Standalone mode |
| 79 | 79 | ||
| 80 | HGInventoryService inventoryService = new HGInventoryService(m_networkServersInfo.InventoryURL, null, false); | 80 | // HGInventoryService inventoryService = new HGInventoryService(m_networkServersInfo.InventoryURL, null, false); |
| 81 | inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource); | 81 | // inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource); |
| 82 | 82 | ||
| 83 | LocalUserServices userService = | 83 | // LocalUserServices userService = |
| 84 | new LocalUserServices( | 84 | // new LocalUserServices( |
| 85 | m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService); | 85 | // m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService); |
| 86 | userService.AddPlugin(m_configSettings.StandaloneUserPlugin, m_configSettings.StandaloneUserSource); | 86 | // userService.AddPlugin(m_configSettings.StandaloneUserPlugin, m_configSettings.StandaloneUserSource); |
| 87 | 87 | ||
| 88 | //LocalBackEndServices backendService = new LocalBackEndServices(); | 88 | // //LocalBackEndServices backendService = new LocalBackEndServices(); |
| 89 | HGGridServicesStandalone gridService = new HGGridServicesStandalone(m_networkServersInfo, m_httpServer, m_assetCache, m_sceneManager); | 89 | // HGGridServicesStandalone gridService = new HGGridServicesStandalone(m_networkServersInfo, m_httpServer, m_assetCache, m_sceneManager); |
| 90 | 90 | ||
| 91 | LocalLoginService loginService = | 91 | // LocalLoginService loginService = |
| 92 | new LocalLoginService( | 92 | // new LocalLoginService( |
| 93 | userService, m_configSettings.StandaloneWelcomeMessage, inventoryService, gridService.LocalBackend, m_networkServersInfo, | 93 | // userService, m_configSettings.StandaloneWelcomeMessage, inventoryService, gridService.LocalBackend, m_networkServersInfo, |
| 94 | m_configSettings.StandaloneAuthenticate, libraryRootFolder); | 94 | // m_configSettings.StandaloneAuthenticate, libraryRootFolder); |
| 95 | 95 | ||
| 96 | 96 | ||
| 97 | m_commsManager = new HGCommunicationsStandalone(m_networkServersInfo, m_httpServer, m_assetCache, | 97 | // m_commsManager = new HGCommunicationsStandalone(m_networkServersInfo, m_httpServer, m_assetCache, |
| 98 | userService, userService, inventoryService, gridService, userService, libraryRootFolder, m_configSettings.DumpAssetsToFile); | 98 | // userService, userService, inventoryService, gridService, userService, libraryRootFolder, m_configSettings.DumpAssetsToFile); |
| 99 | 99 | ||
| 100 | inventoryService.UserProfileCache = m_commsManager.UserProfileCacheService; | 100 | // inventoryService.UserProfileCache = m_commsManager.UserProfileCacheService; |
| 101 | HGServices = gridService; | 101 | // HGServices = gridService; |
| 102 | 102 | ||
| 103 | // set up XMLRPC handler for client's initial login request message | 103 | // // set up XMLRPC handler for client's initial login request message |
| 104 | m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod); | 104 | // m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod); |
| 105 | 105 | ||
| 106 | // provides the web form login | 106 | // // provides the web form login |
| 107 | m_httpServer.AddHTTPHandler("login", loginService.ProcessHTMLLogin); | 107 | // m_httpServer.AddHTTPHandler("login", loginService.ProcessHTMLLogin); |
| 108 | 108 | ||
| 109 | // Provides the LLSD login | 109 | // // Provides the LLSD login |
| 110 | m_httpServer.SetDefaultLLSDHandler(loginService.LLSDLoginMethod); | 110 | // m_httpServer.SetDefaultLLSDHandler(loginService.LLSDLoginMethod); |
| 111 | 111 | ||
| 112 | // provide grid info | 112 | // // provide grid info |
| 113 | // m_gridInfoService = new GridInfoService(m_config.Source.Configs["Startup"].GetString("inifile", Path.Combine(Util.configDir(), "OpenSim.ini"))); | 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); | 114 | // m_gridInfoService = new GridInfoService(m_config.Source); |
| 115 | m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod); | 115 | // m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod); |
| 116 | m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod)); | 116 | // m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod)); |
| 117 | } | 117 | //} |
| 118 | 118 | ||
| 119 | protected override void InitialiseGridServices(LibraryRootFolder libraryRootFolder) | 119 | //protected override void InitialiseGridServices(LibraryRootFolder libraryRootFolder) |
| 120 | { | 120 | //{ |
| 121 | m_commsManager = new HGCommunicationsGridMode(m_networkServersInfo, m_httpServer, m_assetCache, m_sceneManager, libraryRootFolder); | 121 | // m_commsManager = new HGCommunicationsGridMode(m_networkServersInfo, m_httpServer, m_assetCache, m_sceneManager, libraryRootFolder); |
| 122 | 122 | ||
| 123 | HGServices = ((HGCommunicationsGridMode)m_commsManager).HGServices; | 123 | // HGServices = ((HGCommunicationsGridMode)m_commsManager).HGServices; |
| 124 | 124 | ||
| 125 | m_httpServer.AddStreamHandler(new SimStatusHandler()); | 125 | // m_httpServer.AddStreamHandler(new SimStatusHandler()); |
| 126 | } | 126 | //} |
| 127 | 127 | ||
| 128 | protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, | 128 | protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, |
| 129 | AgentCircuitManager circuitManager) | 129 | AgentCircuitManager circuitManager) |