From ce4bcb50655e69277eac64a6d3ab520d669e6b70 Mon Sep 17 00:00:00 2001
From: Johan Berntsson
Date: Wed, 23 Jul 2008 09:46:04 +0000
Subject: The new secure inventory server mode (in r5590) can now be disabled
 from OpenSim.ini. Default is to use the new mode.

---
 .../Framework/Communications/Cache/UserProfileCacheService.cs    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs')

diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index e22dff6..d6421b0 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -146,7 +146,14 @@ namespace OpenSim.Framework.Communications.Cache
             CachedUserInfo userInfo = GetUserDetails(userID);
             if (userInfo != null)
             {
-                m_commsManager.SecureInventoryService.RequestInventoryForUser(userID, userInfo.SessionID, userInfo.InventoryReceive);
+                if (m_commsManager.SecureInventoryService != null)
+                {
+                    m_commsManager.SecureInventoryService.RequestInventoryForUser(userID, userInfo.SessionID, userInfo.InventoryReceive);
+                }
+                else
+                {
+                    m_commsManager.InventoryService.RequestInventoryForUser(userID, userInfo.InventoryReceive);
+                }
                 //IInventoryServices invService = userInfo.GetInventoryService();
                 //if (invService != null)
                 //{
-- 
cgit v1.1