More on mantis #7594, this a=time addressing the reported exception, which seems to be a separate issue from the duplicate folders.

fsassets
Diva Canto 2015-06-01 16:37:04 -07:00
parent 7effd3b158
commit 7b5e97f04f
1 changed files with 3 additions and 0 deletions

View File

@ -716,6 +716,9 @@ namespace OpenSim.Capabilities.Handlers
InventoryCollection[] linkedFolders = m_InventoryService.GetMultipleFoldersContent(coll.Collection.OwnerID, folderIDs.ToArray()); InventoryCollection[] linkedFolders = m_InventoryService.GetMultipleFoldersContent(coll.Collection.OwnerID, folderIDs.ToArray());
foreach (InventoryCollection linkedFolderContents in linkedFolders) foreach (InventoryCollection linkedFolderContents in linkedFolders)
{ {
if (linkedFolderContents == null)
continue;
List<InventoryItemBase> links = linkedFolderContents.Items; List<InventoryItemBase> links = linkedFolderContents.Items;
itemsToReturn.InsertRange(0, links); itemsToReturn.InsertRange(0, links);