diff options
Diffstat (limited to 'indra/newview/lloutfitslist.cpp')
| -rw-r--r-- | indra/newview/lloutfitslist.cpp | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp index 8147a97317..63ffb80ff2 100644 --- a/indra/newview/lloutfitslist.cpp +++ b/indra/newview/lloutfitslist.cpp @@ -665,18 +665,7 @@ bool LLOutfitsList::isActionEnabled(const LLSD& userdata) } if (command_name == "wear") { - if (gAgentWearables.isCOFChangeInProgress()) - { - return false; - } - - if (hasItemSelected()) - { - return canWearSelected(); - } - - // outfit selected - return LLAppearanceMgr::getCanAddToCOF(mSelectedOutfitUUID); + return !gAgentWearables.isCOFChangeInProgress(); } if (command_name == "take_off") { @@ -688,7 +677,6 @@ bool LLOutfitsList::isActionEnabled(const LLSD& userdata) if (command_name == "wear_add") { - // *TODO: do we ever get here? if (gAgentWearables.isCOFChangeInProgress()) { return false; @@ -996,26 +984,6 @@ bool LLOutfitsList::canTakeOffSelected() return false; } -bool LLOutfitsList::canWearSelected() -{ - uuid_vec_t selected_items; - getSelectedItemsUUIDs(selected_items); - - for (uuid_vec_t::const_iterator it = selected_items.begin(); it != selected_items.end(); ++it) - { - const LLUUID& id = *it; - - // Check whether the item is worn. - if (!get_can_item_be_worn(id)) - { - return false; - } - } - - // All selected items can be worn. - return true; -} - void LLOutfitsList::onAccordionTabRightClick(LLUICtrl* ctrl, S32 x, S32 y, const LLUUID& cat_id) { LLAccordionCtrlTab* tab = dynamic_cast<LLAccordionCtrlTab*>(ctrl); |