diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-08-21 17:03:42 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-08-21 17:03:42 -0400 |
| commit | b232919c0a6d66582b57c8997fee7a99ab9bbddb (patch) | |
| tree | f343ab51c49bdeffff0dc0a38d68fc1de36f36a0 /indra/newview/llviewermenu.cpp | |
| parent | 2db20dd01b12be830e8b5ac58172e9963b73eba1 (diff) | |
SH-3625 WIP - consolidating code paths for wearable/attachment removal
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llviewermenu.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 01a54509ef..5bed2eccb5 100644..100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7897,7 +7897,7 @@ class LLEditTakeOff : public view_listener_t { std::string clothing = userdata.asString(); if (clothing == "all") - LLWearableBridge::removeAllClothesFromAvatar(); + LLAppearanceMgr::instance().removeAllClothesFromAvatar(); else { LLWearableType::EType type = LLWearableType::typeNameToType(clothing); @@ -7907,8 +7907,8 @@ class LLEditTakeOff : public view_listener_t { // MULTI-WEARABLES: assuming user wanted to remove top shirt. U32 wearable_index = gAgentWearables.getWearableCount(type) - 1; - LLViewerInventoryItem *item = dynamic_cast<LLViewerInventoryItem*>(gAgentWearables.getWearableInventoryItem(type,wearable_index)); - LLWearableBridge::removeItemFromAvatar(item); + LLUUID item_id = gAgentWearables.getWearableItemID(type,wearable_index); + LLAppearanceMgr::instance().removeItemFromAvatar(item_id); } } |