diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-28 10:37:06 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-28 10:37:06 +0100 |
commit | 77c3a65db60e5ba5f5507c0f68a5d92cc67b83f9 (patch) | |
tree | 310cd028cea3fe636ce355d044564f009f40c9ef /indra/newview/llpaneloutfitedit.cpp | |
parent | b6804a855bc54b060f5e27cfdce7a8277c590ee9 (diff) | |
parent | 76da1229ec26b582e054e8a1588ea78943c92d70 (diff) |
merge from viewer-release
Diffstat (limited to 'indra/newview/llpaneloutfitedit.cpp')
-rw-r--r-- | indra/newview/llpaneloutfitedit.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp index 8c37133c91..b56cf5c3ce 100644 --- a/indra/newview/llpaneloutfitedit.cpp +++ b/indra/newview/llpaneloutfitedit.cpp @@ -779,9 +779,7 @@ void LLPanelOutfitEdit::updatePlusButton() } // If any of the selected items are not wearable (due to already being worn OR being of the wrong type), disable the add button. - uuid_vec_t::iterator unwearable_item = std::find_if(selected_items.begin(), selected_items.end(), !boost::bind(& get_can_item_be_worn, _1) - // since item can be not worn but in wearing process at that time - we need to check is link to item presents in COF - || boost::bind(&LLAppearanceMgr::isLinkInCOF, _1)); + uuid_vec_t::iterator unwearable_item = std::find_if(selected_items.begin(), selected_items.end(), !boost::bind(&get_can_item_be_worn, _1)); bool can_add = ( unwearable_item == selected_items.end() ); mPlusBtn->setEnabled(can_add); |