mirror of
https://github.com/opensim/opensim.git
synced 2026-08-12 04:05:42 +08:00
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
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user