summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.cpp
diff options
context:
space:
mode:
authorRamzi Linden <ramzi@lindenlab.com>2009-11-10 13:17:26 +0800
committerRamzi Linden <ramzi@lindenlab.com>2009-11-10 13:17:26 +0800
commit4204cce0cec2c3386f751dfdfeb959da6136ce61 (patch)
treebd16bb887eefd7c2998e3d28aad14ec8ce9dd73c /indra/newview/llinventorymodel.cpp
parent729e0b125287586f19f862ec5221bf11d9e5fe49 (diff)
parentae27a93395ef01535e03e02ec9fa5e221ce58e23 (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)
{