diff options
author | Dessie Linden <dessie@lindenlab.com> | 2010-07-09 09:18:03 -0700 |
---|---|---|
committer | Dessie Linden <dessie@lindenlab.com> | 2010-07-09 09:18:03 -0700 |
commit | c371f359dc211f551c9ee3a999a77cee8027c6fa (patch) | |
tree | e41e9b7d9c8ad21743387cdad10178c6d0b3d96b /indra/newview/llpaneloutfitedit.cpp | |
parent | 0a2fc3e4b93c13854a1776456ebed7f53ceb67e8 (diff) | |
parent | d8f795aa9ceaae73ad8890a1110fa6b4045843c7 (diff) |
Merged from viewer-release
Diffstat (limited to 'indra/newview/llpaneloutfitedit.cpp')
-rw-r--r-- | indra/newview/llpaneloutfitedit.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp index 2df1982e03..f8350a56ef 100644 --- a/indra/newview/llpaneloutfitedit.cpp +++ b/indra/newview/llpaneloutfitedit.cpp @@ -567,13 +567,20 @@ void LLPanelOutfitEdit::onSearchEdit(const std::string& string) void LLPanelOutfitEdit::onPlusBtnClicked(void) { - LLUUID selected_id; - getCurrentItemUUID(selected_id); - - if (selected_id.isNull()) return; + uuid_vec_t selected_items; + getSelectedItemsUUID(selected_items); - //replacing instead of adding the item - LLAppearanceMgr::getInstance()->wearItemOnAvatar(selected_id, true, true); + LLPointer<LLInventoryCallback> link_waiter = new LLUpdateAppearanceOnDestroy; + + for(uuid_vec_t::iterator iter = selected_items.begin(); iter != selected_items.end(); iter++) + { + LLUUID selected_id = *iter; + if (!selected_id.isNull()) + { + //replacing instead of adding the item + LLAppearanceMgr::getInstance()->wearItemOnAvatar(selected_id, false, true, link_waiter); + } + } } void LLPanelOutfitEdit::onVisibilityChange() |