diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-08-30 06:38:44 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-08-30 06:38:44 -0400 |
| commit | d84c6625c707b5d61b71749b74f3cc4fb8f02048 (patch) | |
| tree | 7a31d44dfbd4e8244a9ee4f9504fe45ac3280482 /indra/newview/llinventorymodel.cpp | |
| parent | c4acbaf7c4120d4dc6154420c992e3942fd25df3 (diff) | |
| parent | b0bf8b9619ec89a37bfc7d8d9e7f7d49904dfb02 (diff) | |
Automated merge with http://bitbucket.org/aleric/viewer-development-aleric-export
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) |