diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-05-24 16:40:21 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-05-24 16:40:21 -0400 |
| commit | 5ab2127fe36b80815af545f2668d429e74fd322d (patch) | |
| tree | c5300cc631c239ce33b094b56b823d5adf52b2f9 /indra/newview/llappearancemgr.cpp | |
| parent | 358d23a3a0296c132bcdf2b1bc6e904134feac18 (diff) | |
| parent | 0c55c8a0b8fa7befcb5303bf5858501ff7bb872e (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 57720382df..dcef86a5fc 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1493,7 +1493,7 @@ void LLAppearanceMgr::addCOFItemLink(const LLInventoryItem *item, bool do_update // Are these links to different items of the same body part // type? If so, new item will replace old. // TODO: MULTI-WEARABLE: check for wearable limit for clothing types - else if (is_body_part) + else if (is_body_part && (vitem->isWearableType()) && (vitem->getWearableType() == wearable_type)) { if (inv_item->getIsLinkType() && (vitem->getWearableType() == wearable_type)) { |