diff options
author | Justin Clarke Casey | 2009-04-22 22:19:43 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-04-22 22:19:43 +0000 |
commit | 342126b7b9ca386f9160daecb51ecc14487a5f9f (patch) | |
tree | a485a50aebead411fa2f38528b4c0b7ba19e91db /OpenSim/ApplicationPlugins | |
parent | * Resolve http://opensimulator.org/mantis/view.php?id=3509 by passing up the ... (diff) | |
download | opensim-SC_OLD-342126b7b9ca386f9160daecb51ecc14487a5f9f.zip opensim-SC_OLD-342126b7b9ca386f9160daecb51ecc14487a5f9f.tar.gz opensim-SC_OLD-342126b7b9ca386f9160daecb51ecc14487a5f9f.tar.bz2 opensim-SC_OLD-342126b7b9ca386f9160daecb51ecc14487a5f9f.tar.xz |
* Resolve http://opensimulator.org/mantis/view.php?id=3509 by putting some service initialization into CommsManager
* What is really needed is a plugin and interface request system as being done for region modules
Diffstat (limited to '')
-rw-r--r-- | OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | 36 |
1 files changed, 9 insertions, 27 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs index 41ad386..c5aabc6 100644 --- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs +++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | |||
@@ -181,21 +181,14 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager | |||
181 | inventoryService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneInventoryPlugin, | 181 | inventoryService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneInventoryPlugin, |
182 | m_openSim.ConfigurationSettings.StandaloneInventorySource); | 182 | m_openSim.ConfigurationSettings.StandaloneInventorySource); |
183 | 183 | ||
184 | LocalUserServices userService = | ||
185 | new LocalUserServices( | ||
186 | m_openSim.NetServersInfo.DefaultHomeLocX, m_openSim.NetServersInfo.DefaultHomeLocY, inventoryService); | ||
187 | userService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneUserPlugin, | ||
188 | m_openSim.ConfigurationSettings.StandaloneUserSource); | ||
189 | |||
190 | LocalBackEndServices backendService = new LocalBackEndServices(); | 184 | LocalBackEndServices backendService = new LocalBackEndServices(); |
191 | 185 | ||
192 | //LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, backendService); | 186 | //LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, backendService); |
193 | 187 | ||
194 | m_commsManager | 188 | m_commsManager |
195 | = new CommunicationsLocal( | 189 | = new CommunicationsLocal( |
196 | m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, userService, userService, | 190 | m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, |
197 | inventoryService, backendService, userService, | 191 | inventoryService, backendService, libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile); |
198 | libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile); | ||
199 | 192 | ||
200 | CreateGridInfoService(); | 193 | CreateGridInfoService(); |
201 | } | 194 | } |
@@ -207,7 +200,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager | |||
207 | 200 | ||
208 | m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); | 201 | m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); |
209 | m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); | 202 | m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); |
210 | |||
211 | } | 203 | } |
212 | 204 | ||
213 | protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder) | 205 | protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder) |
@@ -215,30 +207,20 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager | |||
215 | // Standalone mode | 207 | // Standalone mode |
216 | 208 | ||
217 | HGInventoryServiceClient inventoryService = new HGInventoryServiceClient(m_openSim.NetServersInfo.InventoryURL, null, false); | 209 | HGInventoryServiceClient inventoryService = new HGInventoryServiceClient(m_openSim.NetServersInfo.InventoryURL, null, false); |
218 | inventoryService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneInventoryPlugin, m_openSim.ConfigurationSettings.StandaloneInventorySource); | 210 | inventoryService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneInventoryPlugin, m_openSim.ConfigurationSettings.StandaloneInventorySource); |
219 | |||
220 | LocalUserServices localuserService = | ||
221 | new LocalUserServices( | ||
222 | m_openSim.NetServersInfo.DefaultHomeLocX, m_openSim.NetServersInfo.DefaultHomeLocY, | ||
223 | inventoryService); | ||
224 | localuserService.AddPlugin( | ||
225 | m_openSim.ConfigurationSettings.StandaloneUserPlugin, | ||
226 | m_openSim.ConfigurationSettings.StandaloneUserSource); | ||
227 | |||
228 | HGUserServices userService = new HGUserServices(m_commsManager, localuserService); | ||
229 | // This plugin arrangement could eventually be configurable rather than hardcoded here. | ||
230 | userService.AddPlugin(new OGS1UserDataPlugin(m_commsManager)); | ||
231 | 211 | ||
232 | HGGridServicesStandalone gridService | 212 | HGGridServicesStandalone gridService |
233 | = new HGGridServicesStandalone( | 213 | = new HGGridServicesStandalone( |
234 | m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager); | 214 | m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager); |
235 | 215 | ||
236 | m_commsManager = new HGCommunicationsStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, | 216 | m_commsManager |
237 | userService, localuserService, inventoryService, gridService, userService, libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile); | 217 | = new HGCommunicationsStandalone( |
218 | m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, | ||
219 | inventoryService, gridService, | ||
220 | libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile); | ||
238 | 221 | ||
239 | inventoryService.UserProfileCache = m_commsManager.UserProfileCacheService; | 222 | inventoryService.UserProfileCache = m_commsManager.UserProfileCacheService; |
240 | HGServices = gridService; | 223 | HGServices = gridService; |
241 | userService.SetCommunicationsManager(m_commsManager); | ||
242 | 224 | ||
243 | CreateGridInfoService(); | 225 | CreateGridInfoService(); |
244 | } | 226 | } |