From 46116864b9f8cc63ec97b89f11bb5372f08dbc01 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 14 Aug 2009 11:50:42 -0700
Subject: Returning UUID.Zero is scene and user profile service are null in
 GetSession. This doesn't fix the underlying problem of these things being
 null -- they shouldn't be.

---
 .../Inventory/RemoteInventoryServiceConnector.cs                  | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
index 62df3bd..bef716b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
@@ -135,6 +135,9 @@ 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;
 
@@ -318,10 +321,15 @@ 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)
+            {
                 m_log.Debug("[INVENTORY CONNECTOR]: OOPS! UserProfileCacheService is null");
+                return UUID.Zero;
+            }
 
             CachedUserInfo uinfo = m_UserProfileService.GetUserDetails(userID);
             if (uinfo != null)
-- 
cgit v1.1