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/llappearancemgr.cpp | |
| parent | c4acbaf7c4120d4dc6154420c992e3942fd25df3 (diff) | |
| parent | b0bf8b9619ec89a37bfc7d8d9e7f7d49904dfb02 (diff) | |
Automated merge with http://bitbucket.org/aleric/viewer-development-aleric-export
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 94286fd799..7159d89d21 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -2307,12 +2307,17 @@ bool LLAppearanceMgr::updateBaseOutfit() void LLAppearanceMgr::divvyWearablesByType(const LLInventoryModel::item_array_t& items, wearables_by_type_t& items_by_type) { - items_by_type.reserve(LLWearableType::WT_COUNT); + items_by_type.resize(LLWearableType::WT_COUNT); if (items.empty()) return; for (S32 i=0; i<items.count(); i++) { LLViewerInventoryItem *item = items.get(i); + if (!item) + { + LL_WARNS("Appearance") << "NULL item found" << llendl; + continue; + } // Ignore non-wearables. if (!item->isWearableType()) continue; @@ -2335,6 +2340,7 @@ std::string build_order_string(LLWearableType::EType type, U32 i) struct WearablesOrderComparator { + LOG_CLASS(WearablesOrderComparator); WearablesOrderComparator(const LLWearableType::EType type) { mControlSize = build_order_string(type, 0).size(); |