From 784f70f70405aa5b163865a01637fe6132dd1bc5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 17 May 2011 02:25:05 +0100
Subject: don't throw a null reference if an inventory link target doesn't
 exist when we're inspecting in order to send the required inventory folders

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index e2420101..7b88f4f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1404,7 +1404,10 @@ namespace OpenSim.Region.Framework.Scenes
                     if (item.AssetType == (int)AssetType.Link)
                     {
                         InventoryItemBase linkedItem = InventoryService.GetItem(new InventoryItemBase(item.AssetID));
-                        linkedItemFolderIdsToSend.Add(linkedItem.Folder);
+
+                        // Take care of genuinely broken links where the target doesn't exist
+                        if (linkedItem != null)
+                            linkedItemFolderIdsToSend.Add(linkedItem.Folder);
                     }
                 }
 
-- 
cgit v1.1