diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-21 09:31:49 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-21 09:31:49 -0400 |
commit | 9d2f08427b6f3643f642e3e599a19a2dce3101e7 (patch) | |
tree | 529ff1ed1ac9961ec86f76ec51a6e92e931a64f9 /indra/newview/llpaneloutfitedit.cpp | |
parent | df63c6931e81c034887611711095e3134b9a7318 (diff) | |
parent | 819c7f0dd21b8b819cdc70686682e31cadf155d6 (diff) |
pull updates to the start of 2.6.2 from viewer-development
Diffstat (limited to 'indra/newview/llpaneloutfitedit.cpp')
-rw-r--r-- | indra/newview/llpaneloutfitedit.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp index c10c21683b..9346e48d1e 100644 --- a/indra/newview/llpaneloutfitedit.cpp +++ b/indra/newview/llpaneloutfitedit.cpp @@ -1323,19 +1323,19 @@ void LLPanelOutfitEdit::getCurrentItemUUID(LLUUID& selected_id) void LLPanelOutfitEdit::getSelectedItemsUUID(uuid_vec_t& uuid_list) { + void (uuid_vec_t::* tmp)(LLUUID const &) = &uuid_vec_t::push_back; if (mInventoryItemsPanel->getVisible()) { std::set<LLUUID> item_set = mInventoryItemsPanel->getRootFolder()->getSelectionList(); - std::for_each(item_set.begin(), item_set.end(), boost::bind( &uuid_vec_t::push_back, &uuid_list, _1)); + std::for_each(item_set.begin(), item_set.end(), boost::bind( tmp, &uuid_list, _1)); } else if (mWearablesListViewPanel->getVisible()) { std::vector<LLSD> item_set; mWearableItemsList->getSelectedValues(item_set); - std::for_each(item_set.begin(), item_set.end(), boost::bind( &uuid_vec_t::push_back, &uuid_list, boost::bind(&LLSD::asUUID, _1 ))); - + std::for_each(item_set.begin(), item_set.end(), boost::bind( tmp, &uuid_list, boost::bind(&LLSD::asUUID, _1 ))); } // return selected_id; |