aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 07507b2..13085e3 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1340,7 +1340,10 @@ namespace OpenSim.Region.Framework.Scenes
1340 InventoryItemBase linkedItem = InventoryService.GetItem(new InventoryItemBase(item.AssetID)); 1340 InventoryItemBase linkedItem = InventoryService.GetItem(new InventoryItemBase(item.AssetID));
1341 1341
1342 // Take care of genuinely broken links where the target doesn't exist 1342 // Take care of genuinely broken links where the target doesn't exist
1343 if (linkedItem != null) 1343 // HACK: Also, don't follow up links that just point to other links. In theory this is legitimate,
1344 // but no viewer has been observed to set these up and this is the lazy way of avoiding cycles
1345 // rather than having to keep track of every folder requested in the recursion.
1346 if (linkedItem != null && linkedItem.AssetType != (int)AssetType.Link)
1344 { 1347 {
1345 // We don't need to send the folder if source and destination of the link are in the same 1348 // We don't need to send the folder if source and destination of the link are in the same
1346 // folder. 1349 // folder.