I suspect the viewer doesn't need the target of linked items inside linked folders to go in the reply of the original request. At least my tests indicate that. Pushing this out, so that others who use linked folders a lot more can verify.

1 files changed, 14 insertions, 14 deletions

diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
index 4798dc2..1b7d3f5 100644
--- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
+++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
@@ -725,20 +725,20 @@ namespace OpenSim.Capabilities.Handlers
 
                         itemsToReturn.InsertRange(0, links);
 
-                        foreach (InventoryItemBase link in linkedFolderContents.Items)
-                        {
-                            // Take care of genuinely broken links where the target doesn't exist
-                            // HACK: Also, don't follow up links that just point to other links.  In theory this is legitimate,
-                            // but no viewer has been observed to set these up and this is the lazy way of avoiding cycles
-                            // rather than having to keep track of every folder requested in the recursion.
-                            if (link != null)
-                            {
-                                //m_log.DebugFormat(
-                                //    "[WEB FETCH INV DESC HANDLER]: Adding item {0} {1} from folder {2} linked from {3} ({4} {5})",
-                                //    link.Name, (AssetType)link.AssetType, linkedFolderContents.FolderID, contents.FolderID, link.ID, link.AssetID);
-                                itemIDs.Add(link.ID);
-                            }
-                        }
+                        //foreach (InventoryItemBase link in linkedFolderContents.Items)
+                        //{
+                        //    // Take care of genuinely broken links where the target doesn't exist
+                        //    // HACK: Also, don't follow up links that just point to other links.  In theory this is legitimate,
+                        //    // but no viewer has been observed to set these up and this is the lazy way of avoiding cycles
+                        //    // rather than having to keep track of every folder requested in the recursion.
+                        //    if (link != null && link.AssetType == (int)AssetType.Link)
+                        //    {
+                        //        //m_log.DebugFormat(
+                        //        //    "[WEB FETCH INV DESC HANDLER]: Adding item {0} {1} from folder {2} linked from {3} ({4} {5})",
+                        //        //    link.Name, (AssetType)link.AssetType, linkedFolderContents.FolderID, contents.FolderID, link.ID, link.AssetID);
+                        //        itemIDs.Add(link.AssetID);
+                        //    }
+                        //}
                     }
                 }