diff options
author | Diva Canto | 2015-06-01 16:37:04 -0700 |
---|---|---|
committer | Diva Canto | 2015-06-01 16:37:04 -0700 |
commit | 7b5e97f04f5c91d09852d7d7d42fb1fc1b69997f (patch) | |
tree | 008289948070417f133c17c296790464a7171e07 /OpenSim | |
parent | Mantis #7594. This should be functionally equivalent to what it was, but just... (diff) | |
download | opensim-SC-7b5e97f04f5c91d09852d7d7d42fb1fc1b69997f.zip opensim-SC-7b5e97f04f5c91d09852d7d7d42fb1fc1b69997f.tar.gz opensim-SC-7b5e97f04f5c91d09852d7d7d42fb1fc1b69997f.tar.bz2 opensim-SC-7b5e97f04f5c91d09852d7d7d42fb1fc1b69997f.tar.xz |
More on mantis #7594, this a=time addressing the reported exception, which seems to be a separate issue from the duplicate folders.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs index f968fdc..fdbe1f4 100644 --- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs +++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs | |||
@@ -716,6 +716,9 @@ namespace OpenSim.Capabilities.Handlers | |||
716 | InventoryCollection[] linkedFolders = m_InventoryService.GetMultipleFoldersContent(coll.Collection.OwnerID, folderIDs.ToArray()); | 716 | InventoryCollection[] linkedFolders = m_InventoryService.GetMultipleFoldersContent(coll.Collection.OwnerID, folderIDs.ToArray()); |
717 | foreach (InventoryCollection linkedFolderContents in linkedFolders) | 717 | foreach (InventoryCollection linkedFolderContents in linkedFolders) |
718 | { | 718 | { |
719 | if (linkedFolderContents == null) | ||
720 | continue; | ||
721 | |||
719 | List<InventoryItemBase> links = linkedFolderContents.Items; | 722 | List<InventoryItemBase> links = linkedFolderContents.Items; |
720 | 723 | ||
721 | itemsToReturn.InsertRange(0, links); | 724 | itemsToReturn.InsertRange(0, links); |