diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-08-29 08:38:34 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-08-29 08:38:34 -0400 |
| commit | 05913a83a5f0f7f076ad915f3de4c23330f6d32b (patch) | |
| tree | 893a24c2f3b10f2da722158b4bad967c97613c13 /indra/newview/llinventorymodel.cpp | |
| parent | 1a8d917a6d0d2393a0f0248d0072dd7cfd487609 (diff) | |
| parent | 75a66a146b8f4b3127eb86fec10c24cc45d3f6d7 (diff) | |
Merge changes from product-engine branch
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 08229d3a50..53835f0166 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -501,7 +501,7 @@ void LLInventoryModel::collectDescendentsIf(const LLUUID& id, for(S32 i = 0; i < count; ++i) { item = item_array->get(i); - if (item->getActualType() == LLAssetType::AT_LINK_FOLDER) + if (item && item->getActualType() == LLAssetType::AT_LINK_FOLDER) { LLViewerInventoryCategory *linked_cat = item->getLinkedCategory(); if (linked_cat && linked_cat->getPreferredType() != LLFolderType::FT_OUTFIT) |