From 60df5e51dc977e28507b3446d649eac67556c050 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Fri, 6 Jan 2012 13:01:17 -0800
Subject: EXP-1220 GROUNDWORK -- Create context menu entry to allow import of
 selected item(s)

* Added a context menu for "Send to Marketplace" but disabled the code to show it
  until we decide to move forward with this feature.
* Made some progress unifying the context menu in the outbox for different types
  of items.  (mesh, audio, etc.)
---
 indra/newview/skins/default/xui/en/menu_inventory.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/menu_inventory.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index fb85e5278a..31dcdfffbb 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -694,6 +694,14 @@
 		 parameter="move_to_outbox" />
 	</menu_item_call>
 	<menu_item_call
+	 label="Send to Marketplace"
+	 layout="topleft"
+	 name="Marketplace Send">
+		<menu_item_call.on_click
+		 function="Inventory.DoToSelected"
+		 parameter="send_to_marketplace" />
+	</menu_item_call>
+	<menu_item_call
      label="--no options--"
      layout="topleft"
      name="--no options--" />
-- 
cgit v1.2.3


From a73013f7081db15aae93cc82feb895139b1847db Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Fri, 20 Jan 2012 13:41:43 -0800
Subject: EXP-1799 FIX -- Replace and Add to Outfit options appear as grayed
 out in Inventory

* Modified build context menu code to not disable items that are invisible so
  secondary background fetch can coalesce menu options with proper state.
* Removed "Move to Merchant Outbox" context menu option.
---
 indra/newview/skins/default/xui/en/menu_inventory.xml | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/menu_inventory.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 31dcdfffbb..ef4a1bc061 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -685,14 +685,6 @@
 		 function="Inventory.DoToSelected"
 		 parameter="copy_to_outbox" />
 	</menu_item_call>
-	<menu_item_call
-	 label="Move to Merchant Outbox"
-	 layout="topleft"
-	 name="Merchant Move">
-		<menu_item_call.on_click
-		 function="Inventory.DoToSelected"
-		 parameter="move_to_outbox" />
-	</menu_item_call>
 	<menu_item_call
 	 label="Send to Marketplace"
 	 layout="topleft"
-- 
cgit v1.2.3