From 522463108b61a740f64908242d347da5a3cccf62 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 9 Dec 2009 19:12:05 -0500
Subject: For EXT-2858: Determine gear menu / right-click menu choices for
AppearanceSP
--HG--
branch : avatar-pipeline
---
indra/newview/llinventorybridge.cpp | 11 ++++++++++-
indra/newview/skins/default/xui/en/menu_inventory.xml | 8 ++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index ea47013781..d9a5f1837f 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -67,6 +67,8 @@
using namespace LLOldEvents;
+bool isInOutfitsSidePanel(LLPanel *panel);
+
// Helpers
// bug in busy count inc/dec right now, logic is complex... do we really need it?
void inc_busy_count()
@@ -566,8 +568,15 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
}
items.push_back(std::string("Paste Separator"));
+
+ if (obj && obj->getIsLinkType())
+ {
+ items.push_back(std::string("Remove"));
+ }
+
items.push_back(std::string("Delete"));
- if (!isItemRemovable())
+ const bool is_sidepanel = isInOutfitsSidePanel(mInventoryPanel.get());
+ if ((obj && obj->getIsLinkType() && is_sidepanel) || !isItemRemovable())
{
disabled_items.push_back(std::string("Delete"));
}
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index a36bfb8ec1..7e8d259cd0 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -450,6 +450,14 @@
</menu_item_call>
<menu_item_separator
layout="topleft" />
+ <menu_item_call
+ label="Remove"
+ layout="topleft"
+ name="Remove">
+ <menu_item_call.on_click
+ function="Inventory.DoToSelected"
+ parameter="delete" />
+ </menu_item_call>
<menu_item_call
label="Delete"
layout="topleft"
--
cgit v1.2.3