summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2010-03-30 15:17:14 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2010-03-30 15:17:14 -0400
commitdbcd12a4d14412de6850fbf89dfe58b1f799222d (patch)
tree936cae884c86fa37035e80c509e631bf8ccaaee7 /indra/newview/llappearancemgr.cpp
parent11e6e208d43f1347037fb312921a65af138f47b4 (diff)
EXT-6633 enable basic multiwearables demo
Fixed several areas of code that were not multi-wearables enabled. Specifically allowed for the wearing of created outfits that had links to multiple items of the same type. Such outfits can be created by dragging multiple items of the same type into an unworn outfit folder. When you wear the outfit, all items (up to 5 per type) should be worn. Does not affect right-click options or other buttons. Code reviewed by Vir.
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rw-r--r--indra/newview/llappearancemgr.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index f2d15757c9..18d6ac6bbc 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -1027,7 +1027,7 @@ void LLAppearanceManager::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;
@@ -1117,7 +1117,6 @@ void LLAppearanceManager::updateAgentWearables(LLWearableHoldingPattern* holder,
items.put(item);
wearables.put(wearable);
}
- break;
}
}
}