From 90378004089e35f54301ee9b348a39d87e7b6f40 Mon Sep 17 00:00:00 2001
From: Steve Bennetts <steve@lindenlab.com>
Date: Thu, 15 Oct 2009 18:07:39 -0700
Subject: EXT-651 - Added Upload Image shortcut to Advanced > Keyboard
 Shortcuts. Also cleaned up that menu a little.

--HG--
branch : branch-test
---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 78 +++++++++++-----------
 1 file changed, 38 insertions(+), 40 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index b0839ce255..52a0877b6e 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1065,34 +1065,46 @@
                layout="topleft"
                name="Search"
                shortcut="control|F">
-            <menu_item_check.on_check
-             function="Floater.Visible"
-             parameter="search" />
-            <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="search" />
+              <menu_item_check.on_check
+				 function="Floater.Visible"
+				 parameter="search" />
+              <menu_item_check.on_click
+				 function="Floater.Toggle"
+				 parameter="search" />
             </menu_item_check>
             <menu_item_call
-             enabled="false"
-             label="Release Keys"
+               label="Upload Image (L$[COST])..."
+               layout="topleft"
+               name="Upload Image"
+               shortcut="control|U">
+              <menu_item_call.on_click
+                 function="File.UploadImage"
+                 parameter="" />
+              <menu_item_call.on_enable
+                 function="File.EnableUpload" />
+            </menu_item_call>
+            <menu_item_separator/>
+            <menu_item_call
+             label="Close Window"
              layout="topleft"
-             name="Release Keys">
+             name="Close Window"
+             shortcut="control|W">
                 <menu_item_call.on_click
-                 function="Tools.ReleaseKeys"
-                 parameter="" />
+                 function="File.CloseWindow" />
                 <menu_item_call.on_enable
-                 function="Tools.EnableReleaseKeys"
-                 parameter="" />
+                 function="File.EnableCloseWindow" />
             </menu_item_call>
             <menu_item_call
-             label="Set UI Size to Default"
+             label="Close All Windows"
              layout="topleft"
-             name="Set UI Size to Default">
+             name="Close All Windows"
+             shortcut="control|shift|W">
                 <menu_item_call.on_click
-                 function="View.DefaultUISize" />
+                 function="File.CloseAllWindows" />
+                <menu_item_call.on_enable
+                 function="File.EnableCloseAllWindows" />
             </menu_item_call>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_check
              label="Always Run"
              layout="topleft"
@@ -1113,28 +1125,6 @@
                 <menu_item_check.on_enable
                  function="Agent.enableFlying" />
             </menu_item_check>
-            <menu_item_separator
-             layout="topleft" />
-            <menu_item_call
-             label="Close Window"
-             layout="topleft"
-             name="Close Window"
-             shortcut="control|W">
-                <menu_item_call.on_click
-                 function="File.CloseWindow" />
-                <menu_item_call.on_enable
-                 function="File.EnableCloseWindow" />
-            </menu_item_call>
-            <menu_item_call
-             label="Close All Windows"
-             layout="topleft"
-             name="Close All Windows"
-             shortcut="control|shift|W">
-                <menu_item_call.on_click
-                 function="File.CloseAllWindows" />
-                <menu_item_call.on_enable
-                 function="File.EnableCloseAllWindows" />
-            </menu_item_call>
             <menu_item_separator
              layout="topleft" />
             <menu_item_call
@@ -1305,6 +1295,14 @@
             <menu_item_call.on_click
              function="Advanced.RebakeTextures" />
         </menu_item_call>
+        <menu_item_call
+           label="Set UI Size to Default"
+           layout="topleft"
+           name="Set UI Size to Default">
+          <menu_item_call.on_click
+             function="View.DefaultUISize" />
+        </menu_item_call>
+        <menu_item_separator/>
         <menu_item_check
          label="Limit Select Distance"
          layout="topleft"
-- 
cgit v1.2.3