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

Add temporary debugging in HGInventoryBroker and RemoveXInventoryServiceConnector 

This is for http://opensimulator.org/mantis/view.php?id=5669
If we can't retrieve an IUserManagement module we complain, and we also warn in the log when its manually set in XISC by HGInventoryBroker
remove-scene-viewer
Justin Clark-Casey (justincc) 2011-09-06 23:16:37 +01:00
parent e6cd4defdb
commit d7a516d885
3 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
View File

@ -87,8 +87,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
"Show the bindings between user UUIDs and user names", "Show the bindings between user UUIDs and user names",
String.Empty, String.Empty,
HandleShowUsers); HandleShowUsers);
} }
public bool IsSharedModule public bool IsSharedModule

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

@ -64,7 +64,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
get get
{ {
if (m_UserManagement == null) if (m_UserManagement == null)
{
m_UserManagement = m_Scenes[0].RequestModuleInterface<IUserManagement>(); m_UserManagement = m_Scenes[0].RequestModuleInterface<IUserManagement>();
if (m_UserManagement == null)
m_log.ErrorFormat(
"[HG INVENTORY CONNECTOR]: Could not retrieve IUserManagement module from {0}",
m_Scenes[0].RegionInfo.RegionName);
}
return m_UserManagement; return m_UserManagement;
} }
} }

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

@ -57,12 +57,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
if (m_UserManager == null) if (m_UserManager == null)
{ {
m_UserManager = m_Scene.RequestModuleInterface<IUserManagement>(); m_UserManager = m_Scene.RequestModuleInterface<IUserManagement>();
if (m_UserManager == null)
m_log.ErrorFormat(
"[XINVENTORY CONNECTOR]: Could not retrieve IUserManagement module from {0}",
m_Scene.RegionInfo.RegionName);
} }
return m_UserManager; return m_UserManager;
} }
set set
{ {
m_log.WarnFormat(
"[XINVENTORY CONNECTOR]: Manually setting UserManager {0} (scene {1})", value, m_Scene);
m_UserManager = value; m_UserManager = value;
} }
} }
@ -96,7 +105,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
m_RemoteConnector = new XInventoryServicesConnector(source); m_RemoteConnector = new XInventoryServicesConnector(source);
} }
#region ISharedRegionModule #region ISharedRegionModule
public void Initialise(IConfigSource source) public void Initialise(IConfigSource source)