diff options
author | UbitUmarov | 2015-10-06 21:32:02 +0100 |
---|---|---|
committer | UbitUmarov | 2015-10-06 21:32:02 +0100 |
commit | 7fb1063990824e6fde90759730712781046558ed (patch) | |
tree | ac8580e9ac544f2cd9dec3f0fc0566e12febaf3e /OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs | |
parent | dont send of the contents of LinkFolders (diff) | |
download | opensim-SC_OLD-7fb1063990824e6fde90759730712781046558ed.zip opensim-SC_OLD-7fb1063990824e6fde90759730712781046558ed.tar.gz opensim-SC_OLD-7fb1063990824e6fde90759730712781046558ed.tar.bz2 opensim-SC_OLD-7fb1063990824e6fde90759730712781046558ed.tar.xz |
dont send of the contents of LinkFolders also on Multiple folder fetch. Outfits changes still seem to work, except FS that doesnt delete the links to previus outfits, as singularity does
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs index 0312ec2..4da6c3d 100644 --- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs +++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs | |||
@@ -416,7 +416,7 @@ namespace OpenSim.Capabilities.Handlers | |||
416 | 416 | ||
417 | version = containingFolder.Version; | 417 | version = containingFolder.Version; |
418 | 418 | ||
419 | if (fetchItems) | 419 | if (fetchItems && containingFolder.Type != (short)FolderType.Trash) |
420 | { | 420 | { |
421 | List<InventoryItemBase> itemsToReturn = contents.Items; | 421 | List<InventoryItemBase> itemsToReturn = contents.Items; |
422 | List<InventoryItemBase> originalItems = new List<InventoryItemBase>(itemsToReturn); | 422 | List<InventoryItemBase> originalItems = new List<InventoryItemBase>(itemsToReturn); |
@@ -728,8 +728,8 @@ from docs seems this was never a spec | |||
728 | if (item.AssetType == (int)AssetType.Link) | 728 | if (item.AssetType == (int)AssetType.Link) |
729 | itemIDs.Add(item.AssetID); | 729 | itemIDs.Add(item.AssetID); |
730 | 730 | ||
731 | else if (item.AssetType == (int)AssetType.LinkFolder) | 731 | // else if (item.AssetType == (int)AssetType.LinkFolder) |
732 | folderIDs.Add(item.AssetID); | 732 | // folderIDs.Add(item.AssetID); |
733 | } | 733 | } |
734 | 734 | ||
735 | //m_log.DebugFormat("[XXX]: folder {0} has {1} links and {2} linkfolders", contents.FolderID, itemIDs.Count, folderIDs.Count); | 735 | //m_log.DebugFormat("[XXX]: folder {0} has {1} links and {2} linkfolders", contents.FolderID, itemIDs.Count, folderIDs.Count); |