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

Allow the HGInventoryBroker to set the UserManager when it instantiates a RemoteXInventoryServiceConnector for a visiting HG user. 

Not doing this causes NREs whenever that user tries to access inventory when Hypergrid is turned on since the Remote connector does not have a scene (which is only used to fetch the UserManager)
Aims to address http://opensimulator.org/mantis/view.php?id=5669
remove-scene-viewer
Justin Clark-Casey (justincc) 2011-09-05 22:55:48 +01:00
parent 9f75eaf50e
commit 5e579b71fd
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
View File

@ -572,14 +572,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
string connectorType = new HeloServicesConnector(url).Helo(); string connectorType = new HeloServicesConnector(url).Helo();
m_log.DebugFormat("[HG INVENTORY SERVICE]: HELO returned {0}", connectorType); m_log.DebugFormat("[HG INVENTORY SERVICE]: HELO returned {0}", connectorType);
if (connectorType == "opensim-simian") if (connectorType == "opensim-simian")
{
connector = new SimianInventoryServiceConnector(url); connector = new SimianInventoryServiceConnector(url);
}
else else
connector = new RemoteXInventoryServicesConnector(url); {
RemoteXInventoryServicesConnector rxisc = new RemoteXInventoryServicesConnector(url);
rxisc.UserManager = UserManagementModule;
connector = rxisc;
}
m_connectors.Add(url, connector); m_connectors.Add(url, connector);
} }
} }
return connector; return connector;
} }
} }
} }

7
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
View File

@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
private XInventoryServicesConnector m_RemoteConnector; private XInventoryServicesConnector m_RemoteConnector;
private IUserManagement m_UserManager; private IUserManagement m_UserManager;
private IUserManagement UserManager public IUserManagement UserManager
{ {
get get
{ {
@ -60,6 +60,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
} }
return m_UserManager; return m_UserManager;
} }
set
{
m_UserManager = value;
}
} }
public Type ReplaceableInterface public Type ReplaceableInterface