diff options
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r-- | OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs index 7323ad7..e6b4a89 100644 --- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs +++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | |||
@@ -176,7 +176,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager | |||
176 | 176 | ||
177 | LocalBackEndServices backendService = new LocalBackEndServices(); | 177 | LocalBackEndServices backendService = new LocalBackEndServices(); |
178 | 178 | ||
179 | LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, backendService); | 179 | //LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, backendService); |
180 | 180 | ||
181 | m_commsManager | 181 | m_commsManager |
182 | = new CommunicationsLocal( | 182 | = new CommunicationsLocal( |
@@ -207,10 +207,9 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager | |||
207 | m_openSim.NetServersInfo.DefaultHomeLocX, m_openSim.NetServersInfo.DefaultHomeLocY, inventoryService); | 207 | m_openSim.NetServersInfo.DefaultHomeLocX, m_openSim.NetServersInfo.DefaultHomeLocY, inventoryService); |
208 | userService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneUserPlugin, m_openSim.ConfigurationSettings.StandaloneUserSource); | 208 | userService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneUserPlugin, m_openSim.ConfigurationSettings.StandaloneUserSource); |
209 | 209 | ||
210 | //LocalBackEndServices backendService = new LocalBackEndServices(); | ||
211 | HGGridServicesStandalone gridService = new HGGridServicesStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager); | 210 | HGGridServicesStandalone gridService = new HGGridServicesStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager); |
212 | 211 | ||
213 | LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, gridService.LocalBackend); | 212 | // LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, gridService.LocalBackend); |
214 | 213 | ||
215 | m_commsManager = new HGCommunicationsStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, | 214 | m_commsManager = new HGCommunicationsStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, |
216 | userService, userService, inventoryService, gridService, userService, libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile); | 215 | userService, userService, inventoryService, gridService, userService, libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile); |
@@ -231,24 +230,24 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager | |||
231 | m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); | 230 | m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); |
232 | } | 231 | } |
233 | 232 | ||
234 | private LocalLoginService CreateLoginService(LibraryRootFolder libraryRootFolder, IInterServiceInventoryServices inventoryService, LocalUserServices userService, LocalBackEndServices backendService) | 233 | //private LocalLoginService CreateLoginService(LibraryRootFolder libraryRootFolder, IInterServiceInventoryServices inventoryService, LocalUserServices userService, LocalBackEndServices backendService) |
235 | { | 234 | //{ |
236 | LocalLoginService loginService = | 235 | // LocalLoginService loginService = |
237 | new LocalLoginService( | 236 | // new LocalLoginService( |
238 | userService, m_openSim.ConfigurationSettings.StandaloneWelcomeMessage, inventoryService, backendService, m_openSim.NetServersInfo, | 237 | // userService, m_openSim.ConfigurationSettings.StandaloneWelcomeMessage, inventoryService, backendService, m_openSim.NetServersInfo, |
239 | m_openSim.ConfigurationSettings.StandaloneAuthenticate, libraryRootFolder); | 238 | // m_openSim.ConfigurationSettings.StandaloneAuthenticate, libraryRootFolder); |
240 | 239 | ||
241 | // set up XMLRPC handler for client's initial login request message | 240 | // // set up XMLRPC handler for client's initial login request message |
242 | m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod); | 241 | // m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod); |
243 | 242 | ||
244 | // provides the web form login | 243 | // // provides the web form login |
245 | m_httpServer.AddHTTPHandler("login", loginService.ProcessHTMLLogin); | 244 | // m_httpServer.AddHTTPHandler("login", loginService.ProcessHTMLLogin); |
246 | 245 | ||
247 | // Provides the LLSD login | 246 | // // Provides the LLSD login |
248 | m_httpServer.SetDefaultLLSDHandler(loginService.LLSDLoginMethod); | 247 | // m_httpServer.SetDefaultLLSDHandler(loginService.LLSDLoginMethod); |
249 | 248 | ||
250 | return loginService; | 249 | // return loginService; |
251 | } | 250 | //} |
252 | 251 | ||
253 | private void CreateGridInfoService() | 252 | private void CreateGridInfoService() |
254 | { | 253 | { |