From f9929bb62eb79f80acd49c74f83edee0abc1ab66 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Fri, 10 Jul 2015 15:55:25 +0300
Subject: MAINT-5363 FIXED Selecting an inventory item plus an inventory link
 displays delete menu twice but both delete options are greyed out.

---
 indra/newview/llinventorybridge.cpp                   | 10 +---------
 indra/newview/skins/default/xui/en/menu_inventory.xml |  8 --------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index ddf72bc8cf..31bca6b9a9 100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -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())
 	{
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 7099db63ab..c0dddfc625 100755
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -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"
-- 
cgit v1.2.3