diff options
| author | Diva Canto | 2015-06-02 16:31:56 -0700 |
|---|---|---|
| committer | Diva Canto | 2015-06-02 16:31:56 -0700 |
| commit | 3141664d6b02cfba18c819d64bf59d8f4d15ae54 (patch) | |
| tree | caab091d0bbdbb1cad246d0533c8d8ce08e67e39 | |
| parent | New unit tests for FetchInventory2 cap. (diff) | |
| download | opensim-SC_OLD-3141664d6b02cfba18c819d64bf59d8f4d15ae54.zip opensim-SC_OLD-3141664d6b02cfba18c819d64bf59d8f4d15ae54.tar.gz opensim-SC_OLD-3141664d6b02cfba18c819d64bf59d8f4d15ae54.tar.bz2 opensim-SC_OLD-3141664d6b02cfba18c819d64bf59d8f4d15ae54.tar.xz | |
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.
| -rw-r--r-- | OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs | 28 |
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 | |||
| 725 | 725 | ||
| 726 | itemsToReturn.InsertRange(0, links); | 726 | itemsToReturn.InsertRange(0, links); |
| 727 | 727 | ||
| 728 | foreach (InventoryItemBase link in linkedFolderContents.Items) | 728 | //foreach (InventoryItemBase link in linkedFolderContents.Items) |
| 729 | { | 729 | //{ |
| 730 | // Take care of genuinely broken links where the target doesn't exist | 730 | // // Take care of genuinely broken links where the target doesn't exist |
| 731 | // HACK: Also, don't follow up links that just point to other links. In theory this is legitimate, | 731 | // // HACK: Also, don't follow up links that just point to other links. In theory this is legitimate, |
| 732 | // but no viewer has been observed to set these up and this is the lazy way of avoiding cycles | 732 | // // but no viewer has been observed to set these up and this is the lazy way of avoiding cycles |
| 733 | // rather than having to keep track of every folder requested in the recursion. | 733 | // // rather than having to keep track of every folder requested in the recursion. |
| 734 | if (link != null) | 734 | // if (link != null && link.AssetType == (int)AssetType.Link) |
| 735 | { | 735 | // { |
| 736 | //m_log.DebugFormat( | 736 | // //m_log.DebugFormat( |
| 737 | // "[WEB FETCH INV DESC HANDLER]: Adding item {0} {1} from folder {2} linked from {3} ({4} {5})", | 737 | // // "[WEB FETCH INV DESC HANDLER]: Adding item {0} {1} from folder {2} linked from {3} ({4} {5})", |
| 738 | // link.Name, (AssetType)link.AssetType, linkedFolderContents.FolderID, contents.FolderID, link.ID, link.AssetID); | 738 | // // link.Name, (AssetType)link.AssetType, linkedFolderContents.FolderID, contents.FolderID, link.ID, link.AssetID); |
| 739 | itemIDs.Add(link.ID); | 739 | // itemIDs.Add(link.AssetID); |
| 740 | } | 740 | // } |
| 741 | } | 741 | //} |
| 742 | } | 742 | } |
| 743 | } | 743 | } |
| 744 | 744 | ||