From e324fb241505c92ea845421280c4a8ca372e3ded Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 6 Apr 2012 11:22:30 -0700
Subject: Guard against null inventory contents.

---
 .../Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs')

diff --git a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
index 8b44f72..d5c062b 100644
--- a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
+++ b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
@@ -162,7 +162,7 @@ namespace OpenSim.Capabilities.Handlers
                     invFetch.owner_id, invFetch.folder_id, invFetch.owner_id,
                     invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order, out version);
 
-            if (inv.Folders != null)
+            if (inv != null && inv.Folders != null)
             {
                 foreach (InventoryFolderBase invFolder in inv.Folders)
                 {
@@ -170,7 +170,7 @@ namespace OpenSim.Capabilities.Handlers
                 }
             }
 
-            if (inv.Items != null)
+            if (inv != null && inv.Items != null)
             {
                 foreach (InventoryItemBase invItem in inv.Items)
                 {
-- 
cgit v1.1