Remove llwarns spam on rightclick of bodypart in inventory. Also, disabling 'add' option if group selected wearables would exceed wearable limits should not in any way override visibility of that option.

This commit is contained in:
Shyotl
2015-07-12 02:08:14 -05:00
parent 865ab0572d
commit 4cce1f73c8
2 changed files with 4 additions and 5 deletions

View File

@@ -1937,6 +1937,10 @@ bool LLAppearanceMgr::canAddWearables(const uuid_vec_t& item_ids)
{
++n_clothes;
}
else if (item->getType() == LLAssetType::AT_BODYPART)
{
return false; //If we have a bodypart in selection we cannot use 'add'.
}
else
{
LL_WARNS() << "Unexpected wearable type" << LL_ENDL;

View File

@@ -641,11 +641,6 @@ void disable_context_entries_if_present(LLMenuGL& menu,
if (found)
{
menu_item->setVisible(TRUE);
// A bit of a hack so we can remember that some UI element explicitly set this to be visible
// so that some other UI element from multi-select doesn't later set this invisible.
menu_item->pushVisible(TRUE);
menu_item->setEnabled(FALSE);
}
}