From 7fb1063990824e6fde90759730712781046558ed Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 6 Oct 2015 21:32:02 +0100 Subject: 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 --- OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'OpenSim/Capabilities') 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 version = containingFolder.Version; - if (fetchItems) + if (fetchItems && containingFolder.Type != (short)FolderType.Trash) { List itemsToReturn = contents.Items; List originalItems = new List(itemsToReturn); @@ -728,8 +728,8 @@ from docs seems this was never a spec if (item.AssetType == (int)AssetType.Link) itemIDs.Add(item.AssetID); - else if (item.AssetType == (int)AssetType.LinkFolder) - folderIDs.Add(item.AssetID); +// else if (item.AssetType == (int)AssetType.LinkFolder) +// folderIDs.Add(item.AssetID); } //m_log.DebugFormat("[XXX]: folder {0} has {1} links and {2} linkfolders", contents.FolderID, itemIDs.Count, folderIDs.Count); -- cgit v1.1