aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2012-04-06 11:22:30 -0700
committerDiva Canto2012-04-06 11:22:30 -0700
commite324fb241505c92ea845421280c4a8ca372e3ded (patch)
tree048a726d2566a4cb488769c132d289e1104833dc /OpenSim
parentThank you, BaseHttpServer, for telling me where things go wrong. (diff)
downloadopensim-SC_OLD-e324fb241505c92ea845421280c4a8ca372e3ded.zip
opensim-SC_OLD-e324fb241505c92ea845421280c4a8ca372e3ded.tar.gz
opensim-SC_OLD-e324fb241505c92ea845421280c4a8ca372e3ded.tar.bz2
opensim-SC_OLD-e324fb241505c92ea845421280c4a8ca372e3ded.tar.xz
Guard against null inventory contents.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs4
1 files changed, 2 insertions, 2 deletions
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
162 invFetch.owner_id, invFetch.folder_id, invFetch.owner_id, 162 invFetch.owner_id, invFetch.folder_id, invFetch.owner_id,
163 invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order, out version); 163 invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order, out version);
164 164
165 if (inv.Folders != null) 165 if (inv != null && inv.Folders != null)
166 { 166 {
167 foreach (InventoryFolderBase invFolder in inv.Folders) 167 foreach (InventoryFolderBase invFolder in inv.Folders)
168 { 168 {
@@ -170,7 +170,7 @@ namespace OpenSim.Capabilities.Handlers
170 } 170 }
171 } 171 }
172 172
173 if (inv.Items != null) 173 if (inv != null && inv.Items != null)
174 { 174 {
175 foreach (InventoryItemBase invItem in inv.Items) 175 foreach (InventoryItemBase invItem in inv.Items)
176 { 176 {