From 7b5e97f04f5c91d09852d7d7d42fb1fc1b69997f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 1 Jun 2015 16:37:04 -0700
Subject: More on mantis #7594, this a=time addressing the reported exception,
 which seems to be a separate issue from the duplicate folders.

---
 OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenSim/Capabilities/Handlers/FetchInventory')

diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
index f968fdc..fdbe1f4 100644
--- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
+++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
@@ -716,6 +716,9 @@ namespace OpenSim.Capabilities.Handlers
                     InventoryCollection[] linkedFolders = m_InventoryService.GetMultipleFoldersContent(coll.Collection.OwnerID, folderIDs.ToArray());
                     foreach (InventoryCollection linkedFolderContents in linkedFolders)
                     {
+                        if (linkedFolderContents == null)
+                            continue;
+
                         List<InventoryItemBase> links = linkedFolderContents.Items;
 
                         itemsToReturn.InsertRange(0, links);
-- 
cgit v1.1