From 670719cb76cdf2b624ec84d631cc14f507e5840b Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Wed, 27 Aug 2008 00:40:36 +0000
Subject: Mantis #1903 Thank you, cmickeyb, for a patch that prevents the loss
 of folders received out of sequence, and the items within.

---
 OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | 8 +++++++-
 1 file changed, 7 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 3b02c88..017cb29 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -440,7 +440,13 @@ namespace OpenSim.Framework.Communications.Cache
             {
                 if (userProfile.HasReceivedInventory)
                 {
-                    InventoryItemBase item = userProfile.RootFolder.FindItem(itemID);
+                    InventoryItemBase item = null;
+                    if ( userProfile.RootFolder == null )
+                        m_log.ErrorFormat(
+                            "[AGENT INVENTORY]: User {0} {1} does not have a root folder.",
+                            remoteClient.Name, remoteClient.AgentId);
+                    else
+                        item = userProfile.RootFolder.FindItem(itemID);
                     if (item != null)
                     {
                         remoteClient.SendInventoryItemDetails(ownerID, item);
-- 
cgit v1.1