Merge branch 'master' into htb-throttle

1 files changed, 2 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index f6d8eac..4ae4dc3 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -497,10 +497,11 @@ namespace OpenSim.Region.Framework.Scenes
                 return ret;
             }
 
-            InventoryCollection contents = InventoryService.GetFolderContent(agentID, folderID);
+            InventoryCollection contents = new InventoryCollection();
 
             if (folderID != UUID.Zero)
             {
+                contents = InventoryService.GetFolderContent(agentID, folderID); 
                 InventoryFolderBase containingFolder = new InventoryFolderBase();
                 containingFolder.ID = folderID;
                 containingFolder.Owner = agentID;