diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-12-23 13:48:03 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-12-23 13:48:03 -0800 |
| commit | 223ecb214cce7b2a6b856e2bed77572ff5b99141 (patch) | |
| tree | 84e58a6e1ca26d5d2e512abaf893572470c154d1 /indra/newview/llviewermenu.cpp | |
| parent | 7561bbc87068dfee1283eda757f4cca92c4e5b4c (diff) | |
| parent | 61c240c206a9b242c0d551115b7b430ba40c264c (diff) | |
Merge.
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 23bcca9603..620c700077 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7423,12 +7423,17 @@ class LLEditTakeOff : public view_listener_t { std::string clothing = userdata.asString(); if (clothing == "all") - LLAgentWearables::userRemoveAllClothes(); + LLWearableBridge::removeAllClothesFromAvatar(); else { EWearableType type = LLWearableDictionary::typeNameToType(clothing); if (type >= WT_SHAPE && type < WT_COUNT) - LLAgentWearables::userRemoveWearable(type); + { + // MULTI-WEARABLES + LLViewerInventoryItem *item = dynamic_cast<LLViewerInventoryItem*>(gAgentWearables.getWearableInventoryItem(type,0)); + LLWearableBridge::removeItemFromAvatar(item); + } + } return true; } |