diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-05-24 12:55:22 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-05-24 12:55:22 -0400 |
commit | 583060bc631641d24b607289a77b458078b3e4a8 (patch) | |
tree | afb816976227266bc404c780bcbc5a2c218085cb /indra/newview/llappearancemgr.cpp | |
parent | b92c1b6d74818dacbaeaa2c7c3965dd431463b50 (diff) | |
parent | bd53640901e93346fdc5d3dde534b6be294078a0 (diff) |
automated merge
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rw-r--r-- | indra/newview/llappearancemgr.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 02359ccde8..e9253278eb 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1479,14 +1479,21 @@ void LLAppearanceMgr::addCOFItemLink(const LLInventoryItem *item, bool do_update { // Are these links to the same object? const LLViewerInventoryItem* inv_item = item_array.get(i).get(); + const LLWearableType::EType wearable_type = inv_item->getWearableType(); + + const bool is_body_part = (wearable_type == LLWearableType::WT_SHAPE) + || (wearable_type == LLWearableType::WT_HAIR) + || (wearable_type == LLWearableType::WT_EYES) + || (wearable_type == LLWearableType::WT_SKIN); + if (inv_item->getLinkedUUID() == vitem->getLinkedUUID()) { linked_already = true; } - // Are these links to different items of the same wearable + // Are these links to different items of the same body part // type? If so, new item will replace old. - // MULTI-WEARABLES: revisit if more than one per type is allowed. - else if (FALSE/*areMatchingWearables(vitem,inv_item)*/) + // TODO: MULTI-WEARABLE: check for wearable limit for clothing types + else if (is_body_part) { if (inv_item->getIsLinkType()) { |