EXT-757 Create a consistent Me menu on the login screen

Also reorganize Login menu to the Viewer Design Spec - Top Menus
Also reorganize Debug menu to the Viewer Design Spec - Top Menus

3 files changed, 136 insertions, 126 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_mem_leaking.xml b/indra/newview/skins/default/xui/en/floater_mem_leaking.xml
index 3ce41f5ec3..bd83da02aa 100644
--- a/indra/newview/skins/default/xui/en/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/en/floater_mem_leaking.xml
@@ -6,7 +6,7 @@
  layout="topleft"
  name="MemLeak"
  help_topic="memleak"
- title="Memory Leaking Simulation"
+ title="Simulate a Memory Leak"
  width="350">
     <spinner
      decimal_digits="0"
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 6db6448677..7a0a78bb50 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -9,11 +9,22 @@
  width="802">
     <menu
      create_jump_keys="true"
-     label="File"
+     label="Me"
      layout="topleft"
      name="File">
         <menu_item_call
-         label="Quit"
+         label="Preferences"
+         layout="topleft"
+         name="Preferences..."
+         shortcut="control|P">
+            <menu_item_call.on_click
+             function="ShowFloater"
+             parameter="preferences" />
+        </menu_item_call>
+        <menu_item_separator
+         layout="topleft" />
+        <menu_item_call
+         label="Quit [APP_NAME]"
          layout="topleft"
          name="Quit"
          shortcut="control|Q">
@@ -21,22 +32,15 @@
              function="File.Quit" />
         </menu_item_call>
     </menu>
+<!-- Edit menu merged into the Me menu above
     <menu
      create_jump_keys="true"
      label="Edit"
      layout="topleft"
      name="Edit"
      width="153">
-        <menu_item_call
-         label="Preferences..."
-         layout="topleft"
-         name="Preferences..."
-         shortcut="control|P">
-            <menu_item_call.on_click
-             function="ShowFloater"
-             parameter="preferences" />
-        </menu_item_call>
     </menu>
+-->
     <menu
      create_jump_keys="true"
      label="Help"
@@ -51,6 +55,8 @@
              function="ShowFloater"
              parameter="help f1" />
         </menu_item_call>
+        <menu_item_separator
+         layout="topleft" />
         <menu_item_call
          label="About [APP_NAME]"
          layout="topleft"
@@ -172,7 +178,7 @@
       </menu>
       <menu_item_separator />
       <menu_item_call
-         label="Debug Settings"
+         label="Debug Settings editor"
          layout="topleft"
          name="Debug Settings">
             <menu_item_call.on_click
@@ -189,7 +195,7 @@
         </menu_item_call>
         <menu_item_separator />
         <menu_item_call
-         label="UI Preview Tool"
+         label="XUI Preview Tool"
          layout="topleft"
          name="UI Preview Tool"
          shortcut="control|T">
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 01a4b996ad..b430de2b7b 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1863,7 +1863,7 @@
         <menu_item_separator
          layout="topleft" />
         <menu_item_call
-         label="Debug Settings"
+         label="Debug Settings editor"
          layout="topleft"
          name="Debug Settings">
             <menu_item_call.on_click
@@ -1871,7 +1871,7 @@
              parameter="all" />
         </menu_item_call>
      <menu_item_check
-         label="Debug (QA) Mode"
+         label="Activate Debug Mode (QA)"
          layout="topleft"
          name="Debug Mode"
          shortcut="control|alt|Q">
@@ -1985,7 +1985,73 @@
         </menu>
         <menu
          create_jump_keys="true"
-         label="Debugging"
+         label="Show Info"
+         layout="topleft"
+         name="Display Info"
+         tear_off="true">
+            <menu_item_check
+             label="Show Time"
+             layout="topleft"
+             name="Show Time">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="DebugShowTime" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="DebugShowTime" />
+            </menu_item_check>
+            <menu_item_check
+             label="Show Render Info"
+             layout="topleft"
+             name="Show Render Info">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="DebugShowRenderInfo" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="DebugShowRenderInfo" />
+            </menu_item_check>
+            <menu_item_check
+             label="Show Matrices"
+             layout="topleft"
+             name="Show Matrices">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="DebugShowRenderMatrices" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="DebugShowRenderMatrices" />
+            </menu_item_check>
+            <menu_item_check
+             label="Show Color Under Cursor"
+             layout="topleft"
+             name="Show Color Under Cursor">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="DebugShowColor" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="DebugShowColor" />
+            </menu_item_check>
+            <menu_item_separator
+             layout="topleft" />
+            <menu_item_check
+             label="Show Updates to objects"
+             layout="topleft"
+             name="Show Updates"
+             shortcut="control|alt|shift|U">
+                <menu_item_check.on_check
+                 function="Advanced.CheckShowObjectUpdates"
+                 parameter="ObjectUpdates" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleShowObjectUpdates" />
+            </menu_item_check>
+        </menu>
+        <menu_item_separator
+         layout="topleft" />
+        <menu
+         create_jump_keys="true"
+         label="Force an Error"
          layout="topleft"
          name="Force Errors"
          tear_off="true">
@@ -2039,38 +2105,15 @@
                 <menu_item_call.on_click
                  function="Advanced.ForceErrorDisconnectViewer" />
             </menu_item_call>
-        </menu>
-        <menu_item_separator
-         layout="topleft" />
-        <menu_item_check
-         label="Output Debug Minidump"
-         layout="topleft"
-         name="Output Debug Minidump">
-            <menu_item_check.on_check
-             function="CheckControl"
-             parameter="SaveMinidump" />
-            <menu_item_check.on_click
-             function="ToggleControl"
-             parameter="SaveMinidump" />
-        </menu_item_check>
-        <menu_item_call
-         label="Memory Leaking Simulation"
-         layout="topleft"
-         name="Memory Leaking Simulation">
-            <menu_item_call.on_click
-             function="Floater.Show"
-             parameter="mem_leaking" />
-        </menu_item_call>
-        <menu_item_call
-             label="Bumps, Pushes &amp; Hits..."
+            <menu_item_call
+             label="Simulate a Memory Leak..."
              layout="topleft"
-             name="Bumps, Pushes &amp;amp; Hits">
-                <menu_item_call.on_click
-                 function="Floater.Show"
-                 parameter="bumps" />
-            </menu_item_call>
-        <menu_item_separator
-         layout="topleft" />
+             name="Memory Leaking Simulation">
+               <menu_item_call.on_click
+                function="Floater.Show"
+                parameter="mem_leaking" />
+               </menu_item_call>
+        </menu>
         <menu
          create_jump_keys="true"
          label="Render Tests"
@@ -2120,8 +2163,6 @@
                  function="Advanced.ToggleFrameTest" />
             </menu_item_check>
         </menu>
-        <menu_item_separator
-         layout="topleft" />
       <menu
         create_jump_keys="true"
         label="Render Metadata"
@@ -2261,59 +2302,6 @@
            parameter="raycast" />
         </menu_item_check>
       </menu>
-      <menu_item_separator
-         layout="topleft" />
-        <menu
-         create_jump_keys="true"
-         label="Display Info"
-         layout="topleft"
-         name="Display Info"
-         tear_off="true">
-            <menu_item_check
-             label="Show Time"
-             layout="topleft"
-             name="Show Time">
-                <menu_item_check.on_check
-                 function="CheckControl"
-                 parameter="DebugShowTime" />
-                <menu_item_check.on_click
-                 function="ToggleControl"
-                 parameter="DebugShowTime" />
-            </menu_item_check>
-            <menu_item_check
-             label="Show Render Info"
-             layout="topleft"
-             name="Show Render Info">
-                <menu_item_check.on_check
-                 function="CheckControl"
-                 parameter="DebugShowRenderInfo" />
-                <menu_item_check.on_click
-                 function="ToggleControl"
-                 parameter="DebugShowRenderInfo" />
-            </menu_item_check>
-            <menu_item_check
-             label="Show Matrices"
-             layout="topleft"
-             name="Show Matrices">
-                <menu_item_check.on_check
-                 function="CheckControl"
-                 parameter="DebugShowRenderMatrices" />
-                <menu_item_check.on_click
-                 function="ToggleControl"
-                 parameter="DebugShowRenderMatrices" />
-            </menu_item_check>
-            <menu_item_check
-             label="Show Color Under Cursor"
-             layout="topleft"
-             name="Show Color Under Cursor">
-                <menu_item_check.on_check
-                 function="CheckControl"
-                 parameter="DebugShowColor" />
-                <menu_item_check.on_click
-                 function="ToggleControl"
-                 parameter="DebugShowColor" />
-            </menu_item_check>
-        </menu>
         <menu_item_separator
          layout="topleft" />
         <menu
@@ -2333,6 +2321,8 @@
                  function="ToggleControl"
                  parameter="AgentPause" />
             </menu_item_check>
+            <menu_item_separator
+             layout="topleft" />
             <menu_item_call
              label="Enable Message Log"
              layout="topleft"
@@ -2347,6 +2337,8 @@
                 <menu_item_call.on_click
                  function="Advanced.DisableMessageLog" />
             </menu_item_call>
+            <menu_item_separator
+             layout="topleft" />
             <menu_item_check
              label="Velocity Interpolate Objects"
              layout="topleft"
@@ -2369,6 +2361,8 @@
                  function="ToggleControl"
                  parameter="PingInterpolate" />
             </menu_item_check>
+            <menu_item_separator
+             layout="topleft" />
             <menu_item_call
              label="Drop a Packet"
              layout="topleft"
@@ -2377,20 +2371,41 @@
                 <menu_item_call.on_click
                  function="Advanced.DropPacket" />
             </menu_item_call>
-            <menu_item_check
-             label="Show Updates"
-             layout="topleft"
-             name="Show Updates"
-             shortcut="control|alt|shift|U">
-                <menu_item_check.on_check
-                 function="Advanced.CheckShowObjectUpdates"
-                 parameter="ObjectUpdates" />
-                <menu_item_check.on_click
-                 function="Advanced.ToggleShowObjectUpdates" />
-            </menu_item_check>
         </menu>
         <menu_item_separator
          layout="topleft" />
+        <menu_item_call
+             label="Bumps, Pushes &amp; Hits..."
+             layout="topleft"
+             name="Bumps, Pushes &amp;amp; Hits">
+                <menu_item_call.on_click
+                 function="Floater.Show"
+                 parameter="bumps" />
+            </menu_item_call>
+        <menu_item_check
+         label="Output Debug Minidump"
+         layout="topleft"
+         name="Output Debug Minidump">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="SaveMinidump" />
+            <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="SaveMinidump" />
+        </menu_item_check>
+        <menu_item_check
+         label="Debug Permissions in Build Tool"
+         layout="topleft"
+         name="DebugPermissions">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="DebugPermissions" />
+            <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="DebugPermissions" />
+        </menu_item_check>
+        <menu_item_separator
+         layout="topleft" />
         <menu_item_check
          label="View Admin Options"
          layout="topleft"
@@ -2410,7 +2425,7 @@
              function="Advanced.RequestAdminStatus" />
         </menu_item_call>
         <menu_item_call
-         label="Leave Admin Status"
+         label="Deactivate Admin Status"
          layout="topleft"
          name="Leave Admin Options"
          shortcut="control|alt|shift|G">
@@ -3201,17 +3216,6 @@
         </menu>
         <menu_item_separator
          layout="topleft" />
-        <menu_item_check
-         label="Debug Permissions"
-         layout="topleft"
-         name="DebugPermissions">
-            <menu_item_check.on_check
-             function="CheckControl"
-             parameter="DebugPermissions" />
-            <menu_item_check.on_click
-             function="ToggleControl"
-             parameter="DebugPermissions" />
-        </menu_item_check>
         <menu_item_call
          label="Compress Images"
          layout="topleft"