summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-02-04 17:21:21 -0500
committerLoren Shih <seraph@lindenlab.com>2010-02-04 17:21:21 -0500
commitc25915b39eda279306b8273da4c8ec60fcccb822 (patch)
tree78da486f3208cd3283979d0ec7e2e0073ca6a8be
parent643b014fb858ec547663536dc649d845d2722ed2 (diff)
EXT-4990 : "Remove Link" and "Delete" are both active for links in the InventoryFloater
For links, removed "Delete", since having both "Remove Link" and "Delete" is redundant.
-rw-r--r--indra/newview/llinventorybridge.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index cdc3650366..c1259aa89a 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -582,12 +582,16 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
items.push_back(std::string("Paste Separator"));
+ // "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())
{
disabled_items.push_back(std::string("Delete"));