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/skins/default/xui/en/menu_inventory.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

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

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


From 152010b8c6f0c5e6aec1cf56176d767f70205411 Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Wed, 9 Dec 2009 20:26:20 -0500
Subject: EXT-3063 cleanup of inventory item properties sidepanel

step 1: kill the edit button
step 2: disable info button on main inventory panel if more than one item is
selected.

other steps to be done will be filed as separate jiras

code reviewed by seraph

--HG--
branch : avatar-pipeline
---
 indra/newview/skins/default/xui/en/sidepanel_item_info.xml |  9 ---------
 indra/newview/skins/default/xui/en/sidepanel_task_info.xml | 11 +----------
 2 files changed, 1 insertion(+), 19 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index db8a844eb0..d006fd0700 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -488,15 +488,6 @@
 		 left="5"
 		 bottom="5"
 		 width="313">
-	    <button
-		     follows="bottom|left"
-		     height="25"
-		     label="Edit"
-		     layout="topleft"
-		     left="0"
-		     name="edit_btn"
-		     top="0"
-		     width="50" />
 	    <button
 		     follows="bottom|right"
 		     height="25"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index 348f0dfc09..eff2ca1fcd 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -482,16 +482,7 @@
 		 left="5"
 		 bottom="5"
 		 width="313">
-	    <button
-		     follows="bottom|left"
-		     height="25"
-		     label="Edit"
-		     layout="topleft"
-		     left="0"
-		     name="edit_btn"
-		     top="0"
-		     width="50" />
-	    <button
+        <button
 		     follows="bottom|left"
 		     height="25"
 		     label="Open"
-- 
cgit v1.2.3


From 6af53dd7e2e8c344847dd6936181c545db8e8778 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 10 Dec 2009 15:31:08 -0500
Subject: For EXT-2858: Determine gear menu / right-click menu choices for
 AppearanceSP

--HG--
branch : avatar-pipeline
---
 indra/newview/skins/default/xui/en/menu_inventory.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 7e8d259cd0..660e3858ac 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -451,9 +451,9 @@
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
-     label="Remove"
+     label="Remove Link"
      layout="topleft"
-     name="Remove">
+     name="Remove Link">
         <menu_item_call.on_click
          function="Inventory.DoToSelected"
          parameter="delete" />
-- 
cgit v1.2.3