OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor: tidy up some comments

0.7.4.1
Justin Clark-Casey (justincc) 2012-06-02 05:01:56 +01:00
parent 01a2b0b289
commit 2de5479c3f
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
View File

@ -260,7 +260,7 @@ namespace OpenSim.Capabilities.Handlers
// descendents must only include the links, not the linked items we add // descendents must only include the links, not the linked items we add
descendents = originalItems.Count; descendents = originalItems.Count;
// Second, add target items for links in this folder // Add target items for links in this folder before the links themselves.
foreach (InventoryItemBase item in originalItems) foreach (InventoryItemBase item in originalItems)
{ {
if (item.AssetType == (int)AssetType.Link) if (item.AssetType == (int)AssetType.Link)
@ -276,7 +276,7 @@ namespace OpenSim.Capabilities.Handlers
} }
} }
// First, scan for folder links and add target items in those folders. // Now scan for folder links and insert the items they target and those links at the head of the return data
foreach (InventoryItemBase item in originalItems) foreach (InventoryItemBase item in originalItems)
{ {
if (item.AssetType == (int)AssetType.LinkFolder) if (item.AssetType == (int)AssetType.LinkFolder)
@ -284,10 +284,8 @@ namespace OpenSim.Capabilities.Handlers
InventoryCollection linkedFolderContents = m_InventoryService.GetFolderContent(ownerID, item.AssetID); InventoryCollection linkedFolderContents = m_InventoryService.GetFolderContent(ownerID, item.AssetID);
List<InventoryItemBase> links = linkedFolderContents.Items; List<InventoryItemBase> links = linkedFolderContents.Items;
// Second, insert the links contained in this linked folder.
itemsToReturn.InsertRange(0, links); itemsToReturn.InsertRange(0, links);
// Third, insert the real items linked by the links in this linked folder.
foreach (InventoryItemBase link in linkedFolderContents.Items) foreach (InventoryItemBase link in linkedFolderContents.Items)
{ {
// Take care of genuinely broken links where the target doesn't exist // Take care of genuinely broken links where the target doesn't exist