diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-03-30 15:42:30 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-03-30 15:42:30 -0400 |
| commit | 56434c554275fc4b91cd8c69f69809beb52751fe (patch) | |
| tree | f02a1cad0c6747cd3be6fa3689d582481c1fffe1 /indra/newview/llappearancemgr.cpp | |
| parent | bf49c0fcc472504db6e876620bedef56bc200da4 (diff) | |
| parent | 6d82b0c0a2b470452b86332f3b51d7d720bc7341 (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 80d24f75b9..ac3318ebad 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1032,7 +1032,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; @@ -1122,7 +1122,6 @@ void LLAppearanceMgr::updateAgentWearables(LLWearableHoldingPattern* holder, boo items.put(item); wearables.put(wearable); } - break; } } } |