1 files changed, 4 insertions, 19 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
index 3580c27..575a190 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
@@ -49,7 +49,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         private bool m_Enabled = false;
         private bool m_Initialized = false;
         private Scene m_Scene;
-        private UserProfileCacheService m_UserProfileService; 
         private InventoryServicesConnector m_RemoteConnector;
 
         public Type ReplaceableInterface 
@@ -114,8 +113,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
             if (!m_Initialized)
             {
-                // ugh!
-                scene.CommsManager.UserProfileCacheService.SetInventoryService(this);
                 m_Initialized = true;
             }
 
@@ -133,10 +130,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         public void RegionLoaded(Scene scene)
         {
-            m_UserProfileService = m_Scene.CommsManager.UserProfileCacheService;
-            if (m_UserProfileService != null)
-                m_log.Debug("[XXXX] Set m_UserProfileService in " + m_Scene.RegionInfo.RegionName);
-
             if (!m_Enabled)
                 return;
 
@@ -344,21 +337,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         private UUID GetSessionID(UUID userID)
         {
-            //if (m_Scene == null)
-            //{
-            //    m_log.Debug("[INVENTORY CONNECTOR]: OOPS! scene is null");
-            //}
-
-            if (m_UserProfileService == null)
+            ScenePresence sp = null;
+            if (m_Scene.TryGetAvatar(userID, out sp))
             {
-                //m_log.Debug("[INVENTORY CONNECTOR]: OOPS! UserProfileCacheService is null");
-                return UUID.Zero;
+                return sp.ControllingClient.SessionId;
             }
 
-            CachedUserInfo uinfo = m_UserProfileService.GetUserDetails(userID);
-            if (uinfo != null)
-                return uinfo.SessionID;
-            m_log.DebugFormat("[INVENTORY CONNECTOR]: user profile for {0} not found", userID);
+            m_log.DebugFormat("[INVENTORY CONNECTOR]: scene presence for {0} not found", userID);
             return UUID.Zero;
 
         }