summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2009-11-10 14:26:17 -0500
committerNat Goodspeed <nat@lindenlab.com>2009-11-10 14:26:17 -0500
commitd1e3062ae4b9fa182ea4942117fd37579261fc8c (patch)
tree0c9f737c835d6ee4f8faaf02f026fc4703f08183 /indra/newview/llinventorymodel.cpp
parent37806fe4b2c0a83a5e8b1b2e9b7f260da494488e (diff)
parent033d61ddb312080dc986803f6c1921cbd554c598 (diff)
Merge
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 2693396841..4b7e364cf9 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1271,6 +1271,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)
{