aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-04-22 20:09:45 +0000
committerJustin Clarke Casey2009-04-22 20:09:45 +0000
commit4254733e8abd6184b2b981158882bedc7c48b26a (patch)
treef4308d29a8339bab060aa5a86bf83727c42b70a8
parent* minor: remove some compiler warnings (diff)
downloadopensim-SC_OLD-4254733e8abd6184b2b981158882bedc7c48b26a.zip
opensim-SC_OLD-4254733e8abd6184b2b981158882bedc7c48b26a.tar.gz
opensim-SC_OLD-4254733e8abd6184b2b981158882bedc7c48b26a.tar.bz2
opensim-SC_OLD-4254733e8abd6184b2b981158882bedc7c48b26a.tar.xz
* Resolve http://opensimulator.org/mantis/view.php?id=3509 by passing up the comms manager rather than null
-rw-r--r--OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs17
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGUserServices.cs8
2 files changed, 14 insertions, 11 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index 0280e15..41ad386 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -219,15 +219,19 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
219 219
220 LocalUserServices localuserService = 220 LocalUserServices localuserService =
221 new LocalUserServices( 221 new LocalUserServices(
222 m_openSim.NetServersInfo.DefaultHomeLocX, m_openSim.NetServersInfo.DefaultHomeLocY, inventoryService); 222 m_openSim.NetServersInfo.DefaultHomeLocX, m_openSim.NetServersInfo.DefaultHomeLocY,
223 localuserService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneUserPlugin, m_openSim.ConfigurationSettings.StandaloneUserSource); 223 inventoryService);
224 localuserService.AddPlugin(
225 m_openSim.ConfigurationSettings.StandaloneUserPlugin,
226 m_openSim.ConfigurationSettings.StandaloneUserSource);
224 227
225 HGUserServices userService = new HGUserServices(localuserService); 228 HGUserServices userService = new HGUserServices(m_commsManager, localuserService);
226 // This plugin arrangement could eventually be configurable rather than hardcoded here. 229 // This plugin arrangement could eventually be configurable rather than hardcoded here.
227 OGS1UserDataPlugin userDataPlugin = new OGS1UserDataPlugin(m_commsManager); 230 userService.AddPlugin(new OGS1UserDataPlugin(m_commsManager));
228 userService.AddPlugin(userDataPlugin);
229 231
230 HGGridServicesStandalone gridService = new HGGridServicesStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager); 232 HGGridServicesStandalone gridService
233 = new HGGridServicesStandalone(
234 m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager);
231 235
232 m_commsManager = new HGCommunicationsStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, 236 m_commsManager = new HGCommunicationsStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache,
233 userService, localuserService, inventoryService, gridService, userService, libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile); 237 userService, localuserService, inventoryService, gridService, userService, libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile);
@@ -239,7 +243,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
239 CreateGridInfoService(); 243 CreateGridInfoService();
240 } 244 }
241 245
242
243 protected virtual void InitialiseHGGridServices(LibraryRootFolder libraryRootFolder) 246 protected virtual void InitialiseHGGridServices(LibraryRootFolder libraryRootFolder)
244 { 247 {
245 m_commsManager = new HGCommunicationsGridMode(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager, libraryRootFolder); 248 m_commsManager = new HGCommunicationsGridMode(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager, libraryRootFolder);
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
index 357d8a6..25c6341 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
@@ -52,14 +52,14 @@ namespace OpenSim.Region.Communications.Hypergrid
52 private LocalUserServices m_localUserServices; 52 private LocalUserServices m_localUserServices;
53 53
54 // Constructor called when running in grid mode 54 // Constructor called when running in grid mode
55 public HGUserServices(CommunicationsManager parent) 55 public HGUserServices(CommunicationsManager commsManager)
56 : base(parent) 56 : base(commsManager)
57 { 57 {
58 } 58 }
59 59
60 // Constructor called when running in standalone 60 // Constructor called when running in standalone
61 public HGUserServices(LocalUserServices local) 61 public HGUserServices(CommunicationsManager commsManager, LocalUserServices local)
62 : base(null) 62 : base(commsManager)
63 { 63 {
64 m_localUserServices = local; 64 m_localUserServices = local;
65 } 65 }