diff options
author | Justin Clark-Casey (justincc) | 2011-09-06 23:16:37 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-06 23:16:37 +0100 |
commit | d7a516d885b9b39fe70e4e7a8645ebbd1671b110 (patch) | |
tree | 310ec37335ce9c2ff8d72ed64e0f4486d9a6275f /OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | |
parent | Lock m_pendingObjects when calling GetPendingObjectsCount(). (diff) | |
download | opensim-SC_OLD-d7a516d885b9b39fe70e4e7a8645ebbd1671b110.zip opensim-SC_OLD-d7a516d885b9b39fe70e4e7a8645ebbd1671b110.tar.gz opensim-SC_OLD-d7a516d885b9b39fe70e4e7a8645ebbd1671b110.tar.bz2 opensim-SC_OLD-d7a516d885b9b39fe70e4e7a8645ebbd1671b110.tar.xz |
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
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs index 4a3ccc5..97fdd4e 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | |||
@@ -57,12 +57,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
57 | if (m_UserManager == null) | 57 | if (m_UserManager == null) |
58 | { | 58 | { |
59 | m_UserManager = m_Scene.RequestModuleInterface<IUserManagement>(); | 59 | m_UserManager = m_Scene.RequestModuleInterface<IUserManagement>(); |
60 | |||
61 | if (m_UserManager == null) | ||
62 | m_log.ErrorFormat( | ||
63 | "[XINVENTORY CONNECTOR]: Could not retrieve IUserManagement module from {0}", | ||
64 | m_Scene.RegionInfo.RegionName); | ||
60 | } | 65 | } |
66 | |||
61 | return m_UserManager; | 67 | return m_UserManager; |
62 | } | 68 | } |
63 | 69 | ||
64 | set | 70 | set |
65 | { | 71 | { |
72 | m_log.WarnFormat( | ||
73 | "[XINVENTORY CONNECTOR]: Manually setting UserManager {0} (scene {1})", value, m_Scene); | ||
74 | |||
66 | m_UserManager = value; | 75 | m_UserManager = value; |
67 | } | 76 | } |
68 | } | 77 | } |
@@ -91,12 +100,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
91 | Init(source); | 100 | Init(source); |
92 | } | 101 | } |
93 | 102 | ||
94 | protected void Init(IConfigSource source) | 103 | protected void Init(IConfigSource source) |
95 | { | 104 | { |
96 | m_RemoteConnector = new XInventoryServicesConnector(source); | 105 | m_RemoteConnector = new XInventoryServicesConnector(source); |
97 | } | 106 | } |
98 | 107 | ||
99 | |||
100 | #region ISharedRegionModule | 108 | #region ISharedRegionModule |
101 | 109 | ||
102 | public void Initialise(IConfigSource source) | 110 | public void Initialise(IConfigSource source) |
@@ -186,7 +194,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
186 | return m_RemoteConnector.GetFolderForType(userID, type); | 194 | return m_RemoteConnector.GetFolderForType(userID, type); |
187 | } | 195 | } |
188 | 196 | ||
189 | public InventoryCollection GetFolderContent(UUID userID, UUID folderID) | 197 | public InventoryCollection GetFolderContent(UUID userID, UUID folderID) |
190 | { | 198 | { |
191 | InventoryCollection invCol = m_RemoteConnector.GetFolderContent(userID, folderID); | 199 | InventoryCollection invCol = m_RemoteConnector.GetFolderContent(userID, folderID); |
192 | Util.FireAndForget(delegate | 200 | Util.FireAndForget(delegate |