diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-05-24 11:20:06 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-05-24 11:20:06 -0700 |
| commit | 5f24661778cce273f2baeba3c3ae26c1afa0564a (patch) | |
| tree | 7c2bea2fda1ec4245fd0a23154d488bace6aa287 | |
| parent | f813793fac9938a70cf301bcc53de1a5aa23a630 (diff) | |
| parent | 536712a0410156ae1b216b71a6c98264161169aa (diff) | |
Merge
| -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 44362be6c3..4c50138891 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 && (vitem->getWearableType() == wearable_type)) + else if (is_body_part && (vitem->isWearableType()) && (vitem->getWearableType() == wearable_type)) { if (inv_item->getIsLinkType()) { |