From 332d1b5f2f7684de7e359be17f929f85fe4dbe2c Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Fri, 14 Aug 2009 08:43:46 -0700
Subject: [PATCH] Additional debug messages, and bug fix in
 RemoteInventoryServiceConnector.cs, where the scene reference wasn't being
 set.

---
 .../Inventory/HGInventoryBroker.cs                    | 11 ++++++++++-
 .../Inventory/RemoteInventoryServiceConnector.cs      |  3 ++-
 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 fd12a57ff8..f0493f72a5 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('/');
 
-            if ((userInventoryServerURI == m_LocalGridInventoryURI) || (userInventoryServerURI == ""))
+            m_log.DebugFormat("[HG INVENTORY CONNECTOR]: IsLocalGridUser, comparing {0} to {1}.", userInventoryServerURI, uri);
+
+            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 e4bb86505e..8722e68d41 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);