Additional debug messages, and bug fix in RemoteInventoryServiceConnector.cs, where the scene reference wasn't being set.

2 files changed, 12 insertions, 2 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index fd12a57..f0493f7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -455,15 +455,24 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         private bool IsLocalGridUser(UUID userID)
         {
             if (m_UserProfileService == null)
+            {
+                m_log.DebugFormat("[HG INVENTORY CONNECTOR]: IsLocalGridUser, no profile service. Returning false.");
                 return false;
+            }
 
             CachedUserInfo uinfo = m_UserProfileService.GetUserDetails(userID);
             if (uinfo == null)
+            {
+                m_log.DebugFormat("[HG INVENTORY CONNECTOR]: IsLocalGridUser, no profile for user {0}. Returning false.", userID);
                 return true;
+            }
 
             string userInventoryServerURI = HGNetworkServersInfo.ServerURI(uinfo.UserProfile.UserInventoryURI);
+            string uri = m_LocalGridInventoryURI.TrimEnd('/');
+
+            m_log.DebugFormat("[HG INVENTORY CONNECTOR]: IsLocalGridUser, comparing {0} to {1}.", userInventoryServerURI, uri);
 
-            if ((userInventoryServerURI == m_LocalGridInventoryURI) || (userInventoryServerURI == ""))
+            if ((userInventoryServerURI == uri) || (userInventoryServerURI == ""))
             {
                 return true;
             }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
index e4bb865..8722e68 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
@@ -104,12 +104,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         public void AddRegion(Scene scene)
         {
+            m_Scene = scene;
+
             if (!m_Enabled)
                 return;
 
             if (!m_Initialized)
             {
-                m_Scene = scene;
                 // ugh!
                 scene.CommsManager.UserProfileCacheService.SetInventoryService(this);
                 scene.CommsManager.UserService.SetInventoryService(this);