diff options
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 04b8dce..637246e 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -159,17 +159,24 @@ namespace OpenSim | |||
159 | 159 | ||
160 | if (m_sandbox) | 160 | if (m_sandbox) |
161 | { | 161 | { |
162 | CommunicationsLocal.LocalSettings settings = new CommunicationsLocal.LocalSettings(standaloneWelcomeMessage, standaloneAuthenticate); | ||
163 | |||
164 | LocalInventoryService inventoryService = new LocalInventoryService(); | 162 | LocalInventoryService inventoryService = new LocalInventoryService(); |
165 | inventoryService.AddPlugin(standaloneInventoryPlugin); | 163 | inventoryService.AddPlugin(standaloneInventoryPlugin); |
166 | 164 | ||
167 | LocalUserServices userService = new LocalUserServices(m_networkServersInfo, m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService ); | 165 | LocalUserServices userService = new LocalUserServices(m_networkServersInfo, m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService ); |
168 | userService.AddPlugin( standaloneUserPlugin ); | 166 | userService.AddPlugin( standaloneUserPlugin ); |
169 | 167 | ||
170 | CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, settings, userService, inventoryService); | 168 | LocalBackEndServices backendService = new LocalBackEndServices(); |
169 | |||
170 | CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, userService, inventoryService, backendService, backendService); | ||
171 | m_commsManager = localComms; | 171 | m_commsManager = localComms; |
172 | 172 | ||
173 | |||
174 | LocalLoginService loginService = new LocalLoginService(userService, standaloneWelcomeMessage, localComms, m_networkServersInfo, standaloneAuthenticate); | ||
175 | loginService.OnLoginToRegion += backendService.AddNewSession; | ||
176 | |||
177 | m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod); | ||
178 | |||
179 | |||
173 | if (standaloneAuthenticate) | 180 | if (standaloneAuthenticate) |
174 | { | 181 | { |
175 | this.CreateAccount = localComms.doCreate; | 182 | this.CreateAccount = localComms.doCreate; |