diff options
| author | angela <angela@lindenlab.com> | 2009-11-10 10:48:17 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-10 10:48:17 +0800 |
| commit | 6106c9a7dadcf0ba4a33ad1ee826ccd31909b893 (patch) | |
| tree | aaee63d991c15958e0bfae447bff0c621e0b30f5 /indra/newview/llinventorymodel.cpp | |
| parent | 4be7fa99e743732942a412fac5db4770d198999d (diff) | |
| parent | c84624b2e9656241bd08ea613e37c9d87087096b (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 2 |
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) { |