From e1620c5cc36bfdba23b60b7b9faa776c92103027 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 15 Aug 2008 10:07:45 +0000
Subject: Fixes a case where, when inventory is not currently accessible due to
 other issues, detaching an attachment would cause an exception.

---
 OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 23dd8b6..ca77f2b 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1712,7 +1712,7 @@ namespace OpenSim.Region.Environment.Scenes
 
                 CachedUserInfo userInfo =
                     CommsManager.UserProfileCacheService.GetUserDetails(agentID);
-                if (userInfo != null)
+                if (userInfo != null && userInfo.RootFolder != null)
                 {
                     Queue<InventoryFolderImpl> searchfolders = new Queue<InventoryFolderImpl>();
                     searchfolders.Enqueue(userInfo.RootFolder);
-- 
cgit v1.1