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

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
                 if (m_UserManager == null)
                 {
                     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;
             }
 
             set
             {
+                m_log.WarnFormat(
+                    "[XINVENTORY CONNECTOR]: Manually setting UserManager {0} (scene {1})", value, m_Scene);
+
                 m_UserManager = value;
             }
         }
@@ -91,12 +100,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             Init(source);
         }
 
-        protected  void Init(IConfigSource source)
+        protected void Init(IConfigSource source)
         {
             m_RemoteConnector = new XInventoryServicesConnector(source);
         }
 
-
         #region ISharedRegionModule
 
         public void Initialise(IConfigSource source)
@@ -186,7 +194,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             return m_RemoteConnector.GetFolderForType(userID, type);
         }
 
-        public  InventoryCollection GetFolderContent(UUID userID, UUID folderID)
+        public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
         {
             InventoryCollection invCol = m_RemoteConnector.GetFolderContent(userID, folderID);
             Util.FireAndForget(delegate