From 237a9f926f287b964358b17e06b16074a0c9a8f4 Mon Sep 17 00:00:00 2001
From: Erica Olsen <erica@lindenlab.com>
Date: Mon, 19 Oct 2009 18:02:00 +0000
Subject: EXT-1668 Change topmenu "My Account" to "My Dashboard", move Beacons
 into World > Show

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 75 ++++++++++------------
 1 file changed, 34 insertions(+), 41 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 93a0b917f9..116d8ae12a 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -19,7 +19,7 @@
              parameter="preferences" />
         </menu_item_call>
          <menu_item_call
-             label="Manage My Account"
+             label="My Dashboard"
              layout="topleft"
              name="Manage My Account">
                 <menu_item_call.on_click
@@ -271,6 +271,28 @@
            layout="topleft"
            name="Land"
            tear_off="true">
+          <menu_item_check
+             label="Ban Lines"
+             layout="topleft"
+             name="Ban Lines">
+            <menu_item_check.on_check
+               control="ShowBanLines" />
+            <menu_item_check.on_click
+               function="ToggleControl"
+               parameter="ShowBanLines" />
+          </menu_item_check>
+           <menu_item_check
+                 label="Beacons"
+                 layout="topleft"
+                 name="beacons"
+                 shortcut="control|alt|shift|N">
+                    <menu_item_check.on_check
+                     function="Floater.Visible"
+                     parameter="beacons" />
+                    <menu_item_check.on_click
+                     function="Floater.Toggle"
+                     parameter="beacons" />
+                </menu_item_check>
           <menu_item_check
              label="Property Lines"
              layout="topleft"
@@ -292,16 +314,6 @@
                function="ToggleControl"
                parameter="ShowParcelOwners" />
           </menu_item_check>
-          <menu_item_check
-             label="Ban Lines"
-             layout="topleft"
-             name="Ban Lines">
-            <menu_item_check.on_check
-               control="ShowBanLines" />
-            <menu_item_check.on_click
-               function="ToggleControl"
-               parameter="ShowBanLines" />
-          </menu_item_check>
         </menu>
         <menu_item_separator
          layout="topleft" />
@@ -951,36 +963,6 @@
                      function="Tools.EnableToolNotPie" />
                 </menu_item_call>
             </menu>
-            <menu
-             create_jump_keys="true"
-             label="Beacons"
-             layout="topleft"
-             name="Beacons"
-             tear_off="true">
-                <menu_item_check
-                 label="Beacons"
-                 layout="topleft"
-                 name="beacons"
-                 shortcut="control|alt|shift|N">
-                    <menu_item_check.on_check
-                     function="Floater.Visible"
-                     parameter="beacons" />
-                    <menu_item_check.on_click
-                     function="Floater.Toggle"
-                     parameter="beacons" />
-                </menu_item_check>
-                <menu_item_check
-                 label="Cheesy Beacon"
-                 layout="topleft"
-                 name="Cheesy Beacon">
-                    <menu_item_check.on_check
-                     function="CheckControl"
-                     parameter="CheesyBeacon" />
-                    <menu_item_check.on_click
-                     function="ToggleControl"
-                     parameter="CheesyBeacon" />
-                </menu_item_check>
-            </menu>
         </menu>
         <menu
          create_jump_keys="true"
@@ -1221,6 +1203,17 @@
          layout="topleft"
          name="Highlighting and Visibility"
          tear_off="true">
+         <menu_item_check
+                 label="Cheesy Beacon"
+                 layout="topleft"
+                 name="Cheesy Beacon">
+                    <menu_item_check.on_check
+                     function="CheckControl"
+                     parameter="CheesyBeacon" />
+                    <menu_item_check.on_click
+                     function="ToggleControl"
+                     parameter="CheesyBeacon" />
+                </menu_item_check>
             <menu_item_check
              label="Hide Particles"
              layout="topleft"
-- 
cgit v1.2.3