From 39905b927d60e204438705728d2c214cb3f9ef81 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Thu, 2 Jul 2009 00:38:13 +0000
Subject: merge
 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873
 https://svn.aws.productengine.com/secondlife/pe/stable@888 ->
 viewer-2.0.0-pe-4

---
 indra/newview/skins/default/xui/en/menu_picks.xml | 46 +++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/menu_picks.xml

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

diff --git a/indra/newview/skins/default/xui/en/menu_picks.xml b/indra/newview/skins/default/xui/en/menu_picks.xml
new file mode 100644
index 0000000000..146d7d06fe
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_picks.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+ layout="topleft"
+ name="Picks">
+    <menu_item_call
+     label="Info"
+     layout="topleft"
+     name="pick_info">
+        <menu_item_call.on_click
+         function="Pick.Info" />
+    </menu_item_call>
+    <menu_item_call
+     label="Edit"
+     layout="topleft"
+     name="pick_edit"
+     visible="false">
+        <menu_item_call.on_click
+         function="Pick.Edit" />
+    </menu_item_call>
+    <menu_item_call
+     label="Teleport"
+     layout="topleft"
+     name="pick_teleport">
+        <menu_item_call.on_click
+         function="Pick.Teleport" />
+    </menu_item_call>
+    <menu_item_call
+     label="Show on Map"
+     layout="topleft"
+     name="pick_map">
+        <menu_item_call.on_click
+         function="Pick.Map" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"
+     name="pick_separator"
+     visible="false" />
+    <menu_item_call
+     label="Delete"
+     layout="topleft"
+     name="pick_delete"
+     visible="false">
+        <menu_item_call.on_click
+         function="Pick.Delete" />
+    </menu_item_call>
+</context_menu>
-- 
cgit v1.2.3


From 138bf1132262c479dbbd5c95195db46b1efd065f Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Mon, 24 Aug 2009 20:04:52 +0000
Subject: merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3

DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684

improved text editor (handles multiple fonts simultaneously as well as inline widgets)
---
 indra/newview/skins/default/xui/en/menu_picks.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_picks.xml b/indra/newview/skins/default/xui/en/menu_picks.xml
index 146d7d06fe..7e07a97016 100644
--- a/indra/newview/skins/default/xui/en/menu_picks.xml
+++ b/indra/newview/skins/default/xui/en/menu_picks.xml
@@ -25,7 +25,7 @@
          function="Pick.Teleport" />
     </menu_item_call>
     <menu_item_call
-     label="Show on Map"
+     label="Map"
      layout="topleft"
      name="pick_map">
         <menu_item_call.on_click
-- 
cgit v1.2.3