From 52d9ea1cee1688352f54d01032d82c9480c1bd3d Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 4 Jun 2015 19:57:01 -0700 Subject: [PATCH] Mantis #7603 -- bad folders in inventory could produce null pointer exception. Thanks for the line numbers in the exception trace. --- .../Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs index 7618c3dd36..1ad543b75a 100644 --- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs +++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs @@ -638,7 +638,7 @@ namespace OpenSim.Capabilities.Handlers // The inventory server isn't sending FolderID in the collection... // Must fetch it individually - if (contents.FolderID == UUID.Zero) + else if (contents.FolderID == UUID.Zero) { InventoryFolderBase containingFolder = new InventoryFolderBase(); containingFolder.ID = freq.folder_id;