Changed 'Select Tool' to 'Choose Tool', moved Selection options into a flyout menu

1 files changed, 56 insertions, 53 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 4ba9ae4..2187f0e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -516,7 +516,7 @@
 
   <menu name="Tools" create_jump_keys="true" label="Tools"
         opaque="true" tear_off="true" visible="false">
-    <menu name="Select Tool" create_jump_keys="true" label="Select Tool"
+    <menu name="Select Tool" create_jump_keys="true" label="Choose Tool"
           opaque="true" tear_off="true">
       <menu_item_call name="Focus" label="Focus" shortcut="control|1">
         <on_click function="Tools.SelectTool" userdata="focus" />
@@ -535,48 +535,61 @@
       </menu_item_call>
     </menu>
     <menu_item_separator />
-    <menu_item_check name="Select Only My Objects"
-                     label="Select Only My Objects">
-      <on_click function="Tools.SelectOnlyMyObjects"
-                userdata="agents" />
-      <on_check control="SelectOwnedOnly" />
-    </menu_item_check>
-    <menu_item_check name="Select Only Movable Objects"
-                     label="Select Only Movable Objects">
-      <on_click function="Tools.SelectOnlyMovableObjects"
-                userdata="movable" />
-      <on_check control="SelectMovableOnly" />
-    </menu_item_check>
-    <menu_item_check name="Select Only Copyable Objects"
-                     label="Select Only Copyable Objects">
-      <on_click function="Tools.SelectOnlyCopyableObjects"
-                userdata="copyable" />
-      <on_check control="SelectCopyableOnly" />
-    </menu_item_check>
-    <menu_item_check name="Select By Surrounding"
-                     label="Select By Surrounding">
-      <on_click function="Tools.SelectBySurrounding"
-                userdata="" />
-      <on_check control="RectangleSelectInclusive" />
-    </menu_item_check>
-    <menu_item_check name="Show Hidden Selection"
-                     label="Show Hidden Selection">
-      <on_click function="Tools.ShowHiddenSelection"
-                userdata="" />
-      <on_check control="RenderHiddenSelections" />
-    </menu_item_check>
-    <menu_item_check name="Show Light Radius for Selection"
-                     label="Show Light Radius for Selection">
-      <on_click function="Tools.ShowSelectionLightRadius"
-                userdata="" />
-      <on_check control="RenderLightRadius" />
-    </menu_item_check>
-    <menu_item_check name="Show Selection Beam"
-                     label="Show Selection Beam">
-      <on_click function="ToggleControl"
-                userdata="ShowSelectionBeam" />
-      <on_check control="ShowSelectionBeam" />
-    </menu_item_check>
+    <menu_item_call name="Focus on Selection" enabled="false"
+                    label="Focus on Selection" shortcut="H">
+      <on_click function="Tools.LookAtSelection" userdata="focus" />
+      <on_enable function="Tools.SomethingSelectedNoHUD" />
+    </menu_item_call>
+    <menu_item_call name="Zoom to Selection" enabled="false"
+                    label="Zoom to Selection" shortcut="shift|H">
+      <on_click function="Tools.LookAtSelection" userdata="zoom" />
+      <on_enable function="Tools.SomethingSelectedNoHUD" />
+    </menu_item_call>
+    <menu name="Selection Options" label="Selection Options"
+          create_jump_keys="true" opaque="true" tear_off="true">
+      <menu_item_check name="Select Only My Objects"
+                       label="Select Only My Objects">
+        <on_click function="Tools.SelectOnlyMyObjects"
+                  userdata="agents" />
+        <on_check control="SelectOwnedOnly" />
+      </menu_item_check>
+      <menu_item_check name="Select Only Movable Objects"
+                       label="Select Only Movable Objects">
+        <on_click function="Tools.SelectOnlyMovableObjects"
+                  userdata="movable" />
+        <on_check control="SelectMovableOnly" />
+      </menu_item_check>
+      <menu_item_check name="Select Only Copyable Objects"
+                       label="Select Only Copyable Objects">
+        <on_click function="Tools.SelectOnlyCopyableObjects"
+                  userdata="copyable" />
+        <on_check control="SelectCopyableOnly" />
+      </menu_item_check>
+      <menu_item_check name="Select By Surrounding"
+                       label="Select By Surrounding">
+        <on_click function="Tools.SelectBySurrounding"
+                  userdata="" />
+        <on_check control="RectangleSelectInclusive" />
+      </menu_item_check>
+      <menu_item_check name="Show Hidden Selection"
+                       label="Show Hidden Selection">
+        <on_click function="Tools.ShowHiddenSelection"
+                  userdata="" />
+        <on_check control="RenderHiddenSelections" />
+      </menu_item_check>
+      <menu_item_check name="Show Light Radius for Selection"
+                       label="Show Light Radius for Selection">
+        <on_click function="Tools.ShowSelectionLightRadius"
+                  userdata="" />
+        <on_check control="RenderLightRadius" />
+      </menu_item_check>
+      <menu_item_check name="Show Selection Beam"
+                       label="Show Selection Beam">
+        <on_click function="ToggleControl"
+                  userdata="ShowSelectionBeam" />
+        <on_check control="ShowSelectionBeam" />
+      </menu_item_check>
+    </menu>
     <menu_item_separator />
     <menu_item_check name="Snap to Grid" enabled="false"
                      label="Snap to Grid" shortcut="G">
@@ -619,16 +632,6 @@
       <on_enable function="Tools.EnableUnlink" />
     </menu_item_call>
     <menu_item_separator />
-    <menu_item_call name="Focus on Selection" enabled="false"
-                    label="Focus on Selection" shortcut="H">
-      <on_click function="Tools.LookAtSelection" userdata="focus" />
-      <on_enable function="Tools.SomethingSelectedNoHUD" />
-    </menu_item_call>
-    <menu_item_call name="Zoom to Selection" enabled="false"
-                    label="Zoom to Selection" shortcut="shift|H">
-      <on_click function="Tools.LookAtSelection" userdata="zoom" />
-      <on_enable function="Tools.SomethingSelectedNoHUD" />
-    </menu_item_call>
     <menu_item_call name="Duplicate" enabled="false"
                     label="Duplicate" shortcut="control|D">
       <on_click function="Edit.Duplicate" userdata="" />