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

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

avinationmerge
UbitUmarov 2015-10-06 21:32:02 +01:00
parent aa64d3bb7c
commit 7fb1063990
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
View File

@ -416,7 +416,7 @@ namespace OpenSim.Capabilities.Handlers
version = containingFolder.Version;
if (fetchItems)
if (fetchItems && containingFolder.Type != (short)FolderType.Trash)
{
List<InventoryItemBase> itemsToReturn = contents.Items;
List<InventoryItemBase> originalItems = new List<InventoryItemBase>(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);