MAINT-5363 FIXED Selecting an inventory item plus an inventory link displays delete menu twice but both delete options are greyed out.

meow-7.2.2
andreykproductengine 2015-07-10 15:55:25 +03:00
parent 9790ec0c75
commit f9929bb62e
2 changed files with 1 additions and 17 deletions

View File

@ -863,15 +863,7 @@ void LLInvFVBridge::addDeleteContextMenuOptions(menuentry_vec_t &items,
return;
}
// "Remove link" and "Delete" are the same operation.
if (obj && obj->getIsLinkType() && !get_is_item_worn(mUUID))
{
items.push_back(std::string("Remove Link"));
}
else
{
items.push_back(std::string("Delete"));
}
items.push_back(std::string("Delete"));
if (!isItemRemovable())
{

View File

@ -487,14 +487,6 @@
<menu_item_separator
layout="topleft"
name="Paste Separator" />
<menu_item_call
label="Delete"
layout="topleft"
name="Remove Link">
<menu_item_call.on_click
function="Inventory.DoToSelected"
parameter="delete" />
</menu_item_call>
<menu_item_call
label="Delete"
layout="topleft"