From 3f0b8db0c18afaa44fa2f6b453d60bec34a3cd98 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 29 Jun 2011 00:54:31 +0100
Subject: If an inventory link target is in the same folder as the source, then
 don't recursively request that folder.

Currently, this should never actually happen but certainly best to handle this case
---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 7 ++++++-
 1 file changed, 6 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 f37f94a..8453d35 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1341,7 +1341,12 @@ namespace OpenSim.Region.Framework.Scenes
 
                         // Take care of genuinely broken links where the target doesn't exist
                         if (linkedItem != null)
-                            linkedItemFolderIdsToSend.Add(linkedItem.Folder);
+                        {
+                            // We don't need to send the folder if source and destination of the link are in the same
+                            // folder.
+                            if (linkedItem.Folder != containingFolder.ID)
+                                linkedItemFolderIdsToSend.Add(linkedItem.Folder);
+                        }
                     }
                 }
 
-- 
cgit v1.1