From 8fde48bcb2b12bc595986fe7acea95a8b9adc0a9 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Tue, 12 Jul 2011 03:39:41 -0500 Subject: [PATCH] Abort fetch of null folders. --- indra/newview/llinventorymodel.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 6028cefb1..be94cfd3a 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -1366,6 +1366,11 @@ void LLInventoryModel::fetchInventoryResponder::error(U32 status, const std::str bool LLInventoryModel::fetchDescendentsOf(const LLUUID& folder_id) const { + if(folder_id.isNull()) + { + llwarns << "Calling fetch descendents on NULL folder id!" << llendl; + return false; + } LLViewerInventoryCategory* cat = getCategory(folder_id); if(!cat) {