summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.cpp
diff options
context:
space:
mode:
authorangela <angela@lindenlab.com>2009-11-09 13:34:32 +0800
committerangela <angela@lindenlab.com>2009-11-09 13:34:32 +0800
commit8ea12297e2e757ad6efbeaebd3ee86c0605ce385 (patch)
tree3a8f5928ee17505dc009446b84e11e6a76cd8532 /indra/newview/llinventorymodel.cpp
parent73b1e2bf471dc7261667016825e12fc81576d350 (diff)
escape from infinitive loop of fetching inventory folder with NULL uuid
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
-rw-r--r--indra/newview/llinventorymodel.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index baf34b42ff..c8b9841e5d 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1267,6 +1267,8 @@ void LLInventoryModel::fetchInventoryResponder::error(U32 status, const std::str
bool LLInventoryModel::fetchDescendentsOf(const LLUUID& folder_id)
{
+ if(folder_id.isNull()) return false;
+
LLViewerInventoryCategory* cat = getCategory(folder_id);
if(!cat)
{