diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-03-30 16:49:35 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-03-30 16:49:35 -0400 |
| commit | 98695056c2fbfb91de805d9e2a01cde23668c4d3 (patch) | |
| tree | 672266df350c8314bba57affd344b410fe723bd0 /indra/newview/llappearancemgr.cpp | |
| parent | 094700f49926a1ffb0678bf83cd4670841b618f7 (diff) | |
| parent | 42707397410c6eeb7d8542ff83d29cbf797de4c3 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 5b034b53c0..8c5352ded7 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1033,7 +1033,7 @@ void LLAppearanceMgr::updateCOF(const LLUUID& category, bool append) getDescendentsOfAssetType(category, wear_items, LLAssetType::AT_CLOTHING, false); // Reduce wearables to max of one per type. removeDuplicateItems(wear_items); - filterWearableItems(wear_items, 1); + filterWearableItems(wear_items, 5); // - Attachments: include COF contents only if appending. LLInventoryModel::item_array_t obj_items; @@ -1123,7 +1123,6 @@ void LLAppearanceMgr::updateAgentWearables(LLWearableHoldingPattern* holder, boo items.put(item); wearables.put(wearable); } - break; } } } |