OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Resolve http://opensimulator.org/mantis/view.php?id=3509 by passing up the comms manager rather than null

0.6.5-rc1
Justin Clarke Casey 2009-04-22 20:09:45 +00:00
parent c25ceb009e
commit 4254733e8a
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
View File

@ -219,15 +219,19 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
LocalUserServices localuserService = LocalUserServices localuserService =
new LocalUserServices( new LocalUserServices(
m_openSim.NetServersInfo.DefaultHomeLocX, m_openSim.NetServersInfo.DefaultHomeLocY, inventoryService); m_openSim.NetServersInfo.DefaultHomeLocX, m_openSim.NetServersInfo.DefaultHomeLocY,
localuserService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneUserPlugin, m_openSim.ConfigurationSettings.StandaloneUserSource); inventoryService);
localuserService.AddPlugin(
m_openSim.ConfigurationSettings.StandaloneUserPlugin,
m_openSim.ConfigurationSettings.StandaloneUserSource);
HGUserServices userService = new HGUserServices(localuserService); HGUserServices userService = new HGUserServices(m_commsManager, localuserService);
// This plugin arrangement could eventually be configurable rather than hardcoded here. // This plugin arrangement could eventually be configurable rather than hardcoded here.
OGS1UserDataPlugin userDataPlugin = new OGS1UserDataPlugin(m_commsManager); userService.AddPlugin(new OGS1UserDataPlugin(m_commsManager));
userService.AddPlugin(userDataPlugin);
HGGridServicesStandalone gridService = new HGGridServicesStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager); HGGridServicesStandalone gridService
= new HGGridServicesStandalone(
m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager);
m_commsManager = new HGCommunicationsStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_commsManager = new HGCommunicationsStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache,
userService, localuserService, inventoryService, gridService, userService, libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile); userService, localuserService, inventoryService, gridService, userService, libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile);
@ -239,7 +243,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
CreateGridInfoService(); CreateGridInfoService();
} }
protected virtual void InitialiseHGGridServices(LibraryRootFolder libraryRootFolder) protected virtual void InitialiseHGGridServices(LibraryRootFolder libraryRootFolder)
{ {
m_commsManager = new HGCommunicationsGridMode(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager, libraryRootFolder); m_commsManager = new HGCommunicationsGridMode(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager, libraryRootFolder);

8
OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
View File

@ -52,14 +52,14 @@ namespace OpenSim.Region.Communications.Hypergrid
private LocalUserServices m_localUserServices; private LocalUserServices m_localUserServices;
// Constructor called when running in grid mode // Constructor called when running in grid mode
public HGUserServices(CommunicationsManager parent) public HGUserServices(CommunicationsManager commsManager)
: base(parent) : base(commsManager)
{ {
} }
// Constructor called when running in standalone // Constructor called when running in standalone
public HGUserServices(LocalUserServices local) public HGUserServices(CommunicationsManager commsManager, LocalUserServices local)
: base(null) : base(commsManager)
{ {
m_localUserServices = local; m_localUserServices = local;
} }