diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-24 13:12:39 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-24 13:12:39 -0400 |
| commit | a2c3df025ca3af3536a2b08dd23ee51a148b013b (patch) | |
| tree | 065cd2e2f8aa9e2f564539318f5a8c63ba9c67ad /indra/newview | |
| parent | 583060bc631641d24b607289a77b458078b3e4a8 (diff) | |
| parent | 4ef12d1ecfff418d90a90a39faada56d5effbb36 (diff) | |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview')
| -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 e9253278eb..44362be6c3 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->getWearableType() == wearable_type)) { if (inv_item->getIsLinkType()) { |