diff options
author | Dessie Linden <dessie@lindenlab.com> | 2010-07-07 08:36:21 -0700 |
---|---|---|
committer | Dessie Linden <dessie@lindenlab.com> | 2010-07-07 08:36:21 -0700 |
commit | 8cda9a026691690fd7e4bb0013cbccc287ef96d5 (patch) | |
tree | 63731864000d07323e867d333da4f6f778bbdae1 /indra/newview/llappearancemgr.cpp | |
parent | a1c46ac2921d8e6aee018002eee280d9c6bb4cee (diff) | |
parent | aef4f6ccabe0b2f72296f1a4ae5634080396690a (diff) |
Merged from viewer-release
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rw-r--r-- | indra/newview/llappearancemgr.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 17efc28a6a..f8cff42412 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -989,16 +989,15 @@ bool LLAppearanceMgr::wearItemOnAvatar(const LLUUID& item_id_to_wear, bool do_up { removeCOFItemLinks(gAgentWearables.getWearableItemID(item_to_wear->getWearableType(), wearable_count-1), false); } + addCOFItemLink(item_to_wear, do_update); } + break; case LLAssetType::AT_BODYPART: // TODO: investigate wearables may not be loaded at this point EXT-8231 // Remove the existing wearables of the same type. // Remove existing body parts anyway because we must not be able to wear e.g. two skins. - if (item_to_wear->getType() == LLAssetType::AT_BODYPART) - { - removeCOFLinksOfType(item_to_wear->getWearableType(), false); - } + removeCOFLinksOfType(item_to_wear->getWearableType(), false); addCOFItemLink(item_to_wear, do_update); break; |