EXT-1477 Update top menus and top menu spec - alphabetize, group advanced settings, consistent language

1 files changed, 451 insertions, 517 deletions

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 04a7f76d29..ec528d53ed 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -18,23 +18,7 @@
              function="Floater.Show"
              parameter="preferences" />
         </menu_item_call>
-        <menu_item_separator
-         layout="topleft" />
-        <menu
-         label="My Account"
-         layout="topleft"
-         name="My Account"
-         tear_off="true">
-            <menu_item_call
-             label="Account History"
-             layout="topleft"
-             name="Account History">
-                <menu_item_call.on_click
-                 function="PromptShowURL"
-                 name="AccountHistory_url"
-                 parameter="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php" />
-            </menu_item_call>
-            <menu_item_call
+         <menu_item_call
              label="Manage My Account"
              layout="topleft"
              name="Manage My Account">
@@ -42,28 +26,7 @@
                  function="PromptShowURL"
                  name="ManageMyAccount_url"
                  parameter="WebLaunchJoinNow,http://secondlife.com/account/" />
-            </menu_item_call>
-            <menu_item_separator
-             layout="topleft" />
-            <menu_item_call
-             label="My Land"
-             layout="topleft"
-             name="My Land">
-                <menu_item_call.on_click
-                 function="ShowFloater"
-                 parameter="land_holdings" />
-            </menu_item_call>
-            <menu_item_call
-             label="Buy Land"
-             layout="topleft"
-             name="Buy Land">
-                <menu_item_call.on_click
-                 function="ShowFloater"
-                 parameter="buy land" />
-                <menu_item_call.on_enable
-                 function="World.EnableBuyLand" />
-            </menu_item_call>
-        </menu>
+      </menu_item_call>
         <menu_item_call
          label="Buy L$"
          layout="topleft"
@@ -113,15 +76,13 @@
              function="ShowFloater"
              parameter="gestures" />
         </menu_item_call>
-        <menu_item_separator
-         layout="topleft" />
         <menu
-         label="Status"
+         label="My Status"
          layout="topleft"
          name="Status"
          tear_off="true">
             <menu_item_call
-             label="Set Away"
+             label="Away"
              layout="topleft"
              name="Set Away">
                 <menu_item_call.on_click
@@ -130,7 +91,7 @@
             <menu_item_separator
              layout="topleft"/>
             <menu_item_call
-             label="Set Busy"
+             label="Busy"
              layout="topleft"
              name="Set Busy">
                 <menu_item_call.on_click
@@ -183,7 +144,7 @@
              function="World.Chat" />
         </menu_item_call-->
         <menu_item_check
-         label="Local Chat"
+         label="Nearby Chat"
          layout="topleft"
          name="Nearby Chat"
          shortcut="control|H">
@@ -246,32 +207,32 @@
      layout="topleft"
      name="World"
      tear_off="true">
-        <menu_item_check
-         label="Camera Controls"
+         <menu_item_check
+         label="Move"
          layout="topleft"
-         name="Camera Controls">
+         name="Movement Controls">
             <menu_item_check.on_check
              function="Floater.Visible"
-             parameter="camera" />
+             parameter="moveview" />
             <menu_item_check.on_click
              function="Floater.Toggle"
-             parameter="camera" />
+             parameter="moveview" />
         </menu_item_check>
         <menu_item_check
-         label="Movement Controls"
+         label="View"
          layout="topleft"
-         name="Movement Controls">
+         name="Camera Controls">
             <menu_item_check.on_check
              function="Floater.Visible"
-             parameter="moveview" />
+             parameter="camera" />
             <menu_item_check.on_click
              function="Floater.Toggle"
-             parameter="moveview" />
+             parameter="camera" />
         </menu_item_check>
         <menu_item_separator
          layout="topleft" />
         <menu_item_call
-         label="Place Information"
+         label="Place Profile"
          layout="topleft"
          name="About Land">
             <menu_item_call.on_click
@@ -286,14 +247,32 @@
              function="Floater.Show"
              parameter="region_info" />
         </menu_item_call>
+        <menu_item_call
+             label="Buy Land"
+             layout="topleft"
+             name="Buy Land">
+                <menu_item_call.on_click
+                 function="ShowFloater"
+                 parameter="buy land" />
+                <menu_item_call.on_enable
+                 function="World.EnableBuyLand" />
+            </menu_item_call>
+        <menu_item_call
+             label="My Land"
+             layout="topleft"
+             name="My Land">
+                <menu_item_call.on_click
+                 function="ShowFloater"
+                 parameter="land_holdings" />
+        </menu_item_call>
         <menu
            create_jump_keys="true"
-           label="Land Options"
+           label="Show"
            layout="topleft"
            name="Land"
            tear_off="true">
           <menu_item_check
-             label="Show Property Lines"
+             label="Property Lines"
              layout="topleft"
              name="Property Lines"
              shortcut="control|alt|shift|P">
@@ -304,7 +283,7 @@
                parameter="ShowPropertyLines" />
           </menu_item_check>
           <menu_item_check
-             label="Show Land Owners"
+             label="Land Owners"
              layout="topleft"
              name="Land Owners">
             <menu_item_check.on_check
@@ -314,7 +293,7 @@
                parameter="ShowParcelOwners" />
           </menu_item_check>
           <menu_item_check
-             label="Show Ban Lines"
+             label="Ban Lines"
              layout="topleft"
              name="Ban Lines">
             <menu_item_check.on_check
@@ -360,19 +339,7 @@
                  function="World.EnableTeleportHome" />
             </menu_item_call>
         </menu>
-        <menu_item_check
-         label="World Map"
-         layout="topleft"
-         name="World Map"
-         shortcut="control|M">
-            <menu_item_check.on_check
-             function="Floater.Visible"
-             parameter="world_map" />
-            <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="world_map" />
-        </menu_item_check>        
-        <menu_item_check
+      <menu_item_check
          label="Mini-Map"
          layout="topleft"
          name="Mini-Map"
@@ -384,34 +351,44 @@
              function="Floater.Toggle"
              parameter="mini_map" />
         </menu_item_check>
-        <menu_item_separator
-         layout="topleft" />        
-        <menu_item_check
+         <menu_item_check
+         label="World Map"
+         layout="topleft"
+         name="World Map"
+         shortcut="control|M">
+            <menu_item_check.on_check
+             function="Floater.Visible"
+             parameter="world_map" />
+            <menu_item_check.on_click
+             function="Floater.Toggle"
+             parameter="world_map" />
+        </menu_item_check>
+    <!--    <menu_item_check
          label="Show Navigation Bar"
          layout="topleft"
          name="ShowNavbarNavigationPanel">
            <menu_item_check.on_click
              function="ToggleControl"
-             parameter="ShowNavbarNavigationPanel" /> 
+             parameter="ShowNavbarNavigationPanel" />
              <menu_item_check.on_check
              function="CheckControl"
              parameter="ShowNavbarNavigationPanel" />
-        </menu_item_check>                 
-        <menu_item_check
+        </menu_item_check>
+       <menu_item_check
          label="Show Favorites Bar"
          layout="topleft"
          name="ShowNavbarFavoritesPanel">
            <menu_item_check.on_click
              function="ToggleControl"
-             parameter="ShowNavbarFavoritesPanel" /> 
+             parameter="ShowNavbarFavoritesPanel" />
              <menu_item_check.on_check
              function="CheckControl"
              parameter="ShowNavbarFavoritesPanel" />
-        </menu_item_check>                 
+        </menu_item_check>
         <menu_item_separator
-         layout="topleft" />                  
+         layout="topleft" />-->
         <menu_item_call
-         label="Take Snapshot"
+         label="Snapshot"
          layout="topleft"
          name="Take Snapshot"
          shortcut="control|shift|S">
@@ -419,11 +396,9 @@
              function="Floater.Show"
              parameter="snapshot" />
         </menu_item_call>
-        <menu_item_separator
-         layout="topleft" />
     <menu
          create_jump_keys="true"
-         label="Sun Settings"
+         label="Sun"
          layout="topleft"
          name="Environment Settings"
          tear_off="true">
@@ -462,7 +437,7 @@
                  parameter="midnight" />
             </menu_item_call>
             <menu_item_call
-             label="Use region settings"
+             label="Use Place Settings"
              layout="topleft"
              name="Revert to Region Default">
                 <menu_item_call.on_click
@@ -489,7 +464,7 @@
      tear_off="true"
      visible="true">
        <menu_item_check
-         label="Show Build Tools"
+         label="Build"
          layout="topleft"
          name="Show Build Tools"
          shortcut="control|B">
@@ -831,6 +806,17 @@
                 <menu_item_call.on_click
                  function="Floater.Toggle"
                  parameter="perm_prefs" />
+         <menu_item_check
+         label="Show Advanced 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>
             <!--menu_item_call
              label="Show Script Warning/Error Window"
@@ -1018,7 +1004,7 @@
              function="Floater.Show"
              parameter="hud" />
         </menu_item_call>
-        <menu_item_check
+      <!--  <menu_item_check
          label="Show Quick Tips"
          layout="topleft"
          name="Show Quick Tips">
@@ -1026,11 +1012,11 @@
              function="Help.CheckShowFirstTimeTip" />
             <menu_item_check.on_click
              function="Help.ShowQuickTips" />
-        </menu_item_check>
+        </menu_item_check>-->
         <menu_item_separator
              layout="topleft" />
         <menu_item_call
-             label="Report Abuse..."
+             label="Report Abuse"
              layout="topleft"
              name="Report Abuse">
                 <menu_item_call.on_click
@@ -1054,233 +1040,8 @@
      name="Advanced"
      tear_off="true"
      visible="false">
-        <menu
-         label="Shortcuts"
-         layout="topleft"
-         name="Shortcuts"
-         tear_off="true"
-         visible="false">
-            <menu_item_check
-               label="Search"
-               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>
-            <menu_item_call
-             enabled="false"
-             label="Release Keys"
-             layout="topleft"
-             name="Release Keys">
-                <menu_item_call.on_click
-                 function="Tools.ReleaseKeys"
-                 parameter="" />
-                <menu_item_call.on_enable
-                 function="Tools.EnableReleaseKeys"
-                 parameter="" />
-            </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
-             layout="topleft" />
-            <menu_item_check
-             label="Always Run"
-             layout="topleft"
-             name="Always Run"
-             shortcut="control|R">
-                <menu_item_check.on_check
-                 function="World.CheckAlwaysRun" />
-                <menu_item_check.on_click
-                 function="World.AlwaysRun" />
-            </menu_item_check>
-            <menu_item_check
-             label="Fly"
-             layout="topleft"
-             name="Fly"
-             shortcut="Home">
-                <menu_item_check.on_click
-                 function="Agent.toggleFlying" />
-                <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
-             label="Snapshot to Disk"
-             layout="topleft"
-             name="Snapshot to Disk"
-             shortcut="control|`"
-             use_mac_ctrl="true">
-                <menu_item_call.on_click
-                 function="File.TakeSnapshotToDisk" />
-            </menu_item_call>
-            <menu_item_separator
-             layout="topleft" />
-            <menu_item_call
-             label="Mouselook"
-             layout="topleft"
-             name="Mouselook"
-             shortcut="M">
-                <menu_item_call.on_click
-                 function="View.Mouselook" />
-                <menu_item_call.on_enable
-                 function="View.EnableMouselook" />
-            </menu_item_call>
-            <menu_item_check
-             label="Joystick Flycam"
-             layout="topleft"
-             name="Joystick Flycam"
-             shortcut="alt|shift|F">
-                <menu_item_check.on_check
-                 function="View.CheckJoystickFlycam" />
-                <menu_item_check.on_click
-                 function="View.JoystickFlycam" />
-                <menu_item_check.on_enable
-                 function="View.EnableJoystickFlycam" />
-            </menu_item_check>
-            <menu_item_call
-             label="Reset View"
-             layout="topleft"
-             name="Reset View"
-             shortcut="Esc">
-                <menu_item_call.on_click
-                 function="View.ResetView" />
-            </menu_item_call>
-            <menu_item_call
-             label="Look at Last Chatter"
-             layout="topleft"
-             name="Look at Last Chatter"
-             shortcut="control|\">
-                <menu_item_call.on_click
-                 function="View.LookAtLastChatter" />
-                <menu_item_call.on_enable
-                 function="View.EnableLastChatter" />
-            </menu_item_call>
-            <menu_item_separator
-             layout="topleft" />
-            <menu
-             create_jump_keys="true"
-             label="Select Tool"
-             layout="topleft"
-             name="Select Tool"
-             tear_off="true">
-                <menu_item_call
-                 label="Focus"
-                 layout="topleft"
-                 name="Focus"
-                 shortcut="control|1">
-                    <menu_item_call.on_click
-                     function="Tools.SelectTool"
-                     parameter="focus" />
-                </menu_item_call>
-                <menu_item_call
-                 label="Move"
-                 layout="topleft"
-                 name="Move"
-                 shortcut="control|2">
-                    <menu_item_call.on_click
-                     function="Tools.SelectTool"
-                     parameter="move" />
-                </menu_item_call>
-                <menu_item_call
-                 label="Edit"
-                 layout="topleft"
-                 name="Edit"
-                 shortcut="control|3">
-                    <menu_item_call.on_click
-                     function="Tools.SelectTool"
-                     parameter="edit" />
-                </menu_item_call>
-                <menu_item_call
-                 label="Create"
-                 layout="topleft"
-                 name="Create"
-                 shortcut="control|4">
-                    <menu_item_call.on_click
-                     function="Tools.SelectTool"
-                     parameter="create" />
-                </menu_item_call>
-                <menu_item_call
-                 label="Land"
-                 layout="topleft"
-                 name="Land"
-                 shortcut="control|5">
-                    <menu_item_call.on_click
-                     function="Tools.SelectTool"
-                     parameter="land" />
-                </menu_item_call>
-            </menu>
-            <menu_item_separator
-             layout="topleft" />
-            <menu_item_call
-             label="Zoom In"
-             layout="topleft"
-             name="Zoom In"
-             shortcut="control|0">
-                <menu_item_call.on_click
-                 function="View.ZoomIn" />
-            </menu_item_call>
-            <menu_item_call
-             label="Zoom Default"
-             layout="topleft"
-             name="Zoom Default"
-             shortcut="control|9">
-                <menu_item_call.on_click
-                 function="View.ZoomDefault" />
-            </menu_item_call>
-            <menu_item_call
-             label="Zoom Out"
-             layout="topleft"
-             name="Zoom Out"
-             shortcut="control|8">
-                <menu_item_call.on_click
-                 function="View.ZoomOut" />
-            </menu_item_call>
-            <menu_item_separator
-             layout="topleft" />
-            <menu_item_call
-             label="Toggle Fullscreen"
-             layout="topleft"
-             name="Toggle Fullscreen"
-             shortcut="alt|Enter">
-                <menu_item_call.on_click
-                 function="View.Fullscreen" />
-            </menu_item_call>
-        </menu>
         <menu_item_check
-         label="Go Away/AFK When Idle"
+         label="Set Away After 30 Minutes"
          layout="topleft"
          name="Go Away/AFK When Idle">
             <menu_item_check.on_check
@@ -1291,14 +1052,14 @@
              parameter="AllowIdleAFK" />
         </menu_item_check>
         <menu_item_call
-         label="Stop Animating My Avatar"
+         label="Stop Animating Me"
          layout="topleft"
          name="Stop Animating My Avatar">
             <menu_item_call.on_click
              function="Tools.StopAllAnimations" />
         </menu_item_call>
         <menu_item_call
-         label="Rebake Texture"
+         label="Rebake Textures"
          layout="topleft"
          name="Rebake Texture"
          shortcut="control|alt|R">
@@ -1363,7 +1124,7 @@
              parameter="CompressSnapshotsToDisk" />
         </menu_item_check>
         <menu_item_call
-         label="Save Texture As..."
+         label="Save Texture As"
          layout="topleft"
          name="Save Texture As">
             <menu_item_call.on_click
@@ -1407,16 +1168,6 @@
          name="Highlighting and Visibility"
          tear_off="true">
             <menu_item_check
-             label="Highlight Transparent"
-             layout="topleft"
-             name="Highlight Transparent"
-             shortcut="control|alt|T">
-                <menu_item_check.on_check
-                 function="View.CheckHighlightTransparent" />
-                <menu_item_check.on_click
-                 function="View.HighlightTransparent" />
-            </menu_item_check>
-            <menu_item_check
              label="Hide Particles"
              layout="topleft"
              name="Hide Particles"
@@ -1429,16 +1180,6 @@
                  parameter="hideparticles" />
             </menu_item_check>
             <menu_item_check
-             label="Show HUD Attachments"
-             layout="topleft"
-             name="Show HUD Attachments"
-             shortcut="alt|shift|H">
-                <menu_item_check.on_check
-                 function="View.CheckHUDAttachments" />
-                <menu_item_check.on_click
-                 function="View.ShowHUDAttachments" />
-            </menu_item_check>
-            <menu_item_check
              label="Hide Selected"
              layout="topleft"
              name="Hide Selected">
@@ -1450,6 +1191,26 @@
                  parameter="HideSelectedObjects" />
             </menu_item_check>
             <menu_item_check
+             label="Highlight Transparent"
+             layout="topleft"
+             name="Highlight Transparent"
+             shortcut="control|alt|T">
+                <menu_item_check.on_check
+                 function="View.CheckHighlightTransparent" />
+                <menu_item_check.on_click
+                 function="View.HighlightTransparent" />
+            </menu_item_check>
+            <menu_item_check
+             label="Show HUD Attachments"
+             layout="topleft"
+             name="Show HUD Attachments"
+             shortcut="alt|shift|H">
+                <menu_item_check.on_check
+                 function="View.CheckHUDAttachments" />
+                <menu_item_check.on_click
+                 function="View.ShowHUDAttachments" />
+            </menu_item_check>
+            <menu_item_check
              label="Show Mouselook Crosshairs"
              layout="topleft"
              name="ShowCrosshairs">
@@ -1460,8 +1221,7 @@
                  function="ToggleControl"
                  parameter="ShowCrosshairs" />
             </menu_item_check>
-        </menu>
-        <menu
+  <!-- <menu
          create_jump_keys="true"
          label="Hover Tips"
          layout="topleft"
@@ -1478,9 +1238,9 @@
                  function="View.ShowHoverTips" />
             </menu_item_check>
             <menu_item_separator
-             layout="topleft" />
+             layout="topleft" />-->
             <menu_item_check
-             label="Land Tips"
+             label="Show Land Tooltips"
              layout="topleft"
              name="Land Tips">
                 <menu_item_check.on_check
@@ -1491,7 +1251,7 @@
                 <menu_item_check.on_enable
                  function="View.CheckShowHoverTips" />
             </menu_item_check>
-            <menu_item_check
+ <!--           <menu_item_check
              label="Tips On All Objects"
              layout="topleft"
              name="Tips On All Objects">
@@ -1503,9 +1263,19 @@
                 <menu_item_check.on_enable
                  function="View.CheckShowHoverTips" />
             </menu_item_check>
+        </menu>-->
+      <menu_item_check
+        label="Show Avatar Rendering Cost"
+        layout="topleft"
+        name="Avatar Rendering Cost">
+           <menu_item_check.on_check
+            function="Advanced.CheckInfoDisplay"
+            parameter="shame" />
+           <menu_item_check.on_click
+            function="Advanced.ToggleInfoDisplay"
+            parameter="shame" />
+       </menu_item_check>
         </menu>
-        <menu_item_separator
-         layout="topleft" />
         <menu_item_check
          label="Run Multiple Threads"
          layout="topleft"
@@ -1517,19 +1287,6 @@
              function="ToggleControl"
              parameter="RunMultipleThreads" />
         </menu_item_check>
-        <menu_item_separator
-         layout="topleft" />
-         <menu_item_check
-        label="Avatar Rendering Cost"
-        layout="topleft"
-        name="Avatar Rendering Cost">
-           <menu_item_check.on_check
-            function="Advanced.CheckInfoDisplay"
-            parameter="shame" />
-           <menu_item_check.on_click
-            function="Advanced.ToggleInfoDisplay"
-            parameter="shame" />
-       </menu_item_check>
         <menu
          create_jump_keys="true"
          label="Rendering Types"
@@ -1573,7 +1330,7 @@
                  parameter="tree" />
             </menu_item_check>
             <menu_item_check
-             label="Character"
+             label="Avatars"
              layout="topleft"
              name="Character"
              shortcut="control|alt|shift|4">
@@ -1796,66 +1553,6 @@
                  parameter="flexible" />
             </menu_item_check>
         </menu>
-        <menu_item_separator
-         layout="topleft" />
-        <menu
-         create_jump_keys="true"
-         label="Recorder"
-         layout="topleft"
-         name="Recorder"
-         tear_off="true">
-            <menu_item_call
-             label="Start Playback"
-             layout="topleft"
-             name="Start Playback">
-                <menu_item_call.on_click
-                 function="Advanced.AgentPilot"
-                 parameter="start playback" />
-            </menu_item_call>
-            <menu_item_call
-             label="Stop Playback"
-             layout="topleft"
-             name="Stop Playback">
-                <menu_item_call.on_click
-                 function="Advanced.AgentPilot"
-                 parameter="stop playback" />
-            </menu_item_call>
-            <menu_item_check
-             label="Loop Playback"
-             layout="topleft"
-             name="Loop Playback">
-                <menu_item_check.on_check
-                 function="Advanced.CheckAgentPilotLoop"
-                 parameter="loopPlayback" />
-                <menu_item_check.on_click
-                 function="Advanced.ToggleAgentPilotLoop" />
-            </menu_item_check>
-            <menu_item_call
-             label="Start Record"
-             layout="topleft"
-             name="Start Record">
-                <menu_item_call.on_click
-                 function="Advanced.AgentPilot"
-                 parameter="start record" />
-            </menu_item_call>
-            <menu_item_call
-             label="Stop Record"
-             layout="topleft"
-             name="Stop Record">
-                <menu_item_call.on_click
-                 function="Advanced.AgentPilot"
-                 parameter="stop record" />
-            </menu_item_call>
-        </menu>
-        <menu_item_call
-         label="Dump Scripted Camera"
-         layout="topleft"
-         name="Dump Scripted Camera">
-            <menu_item_call.on_click
-             function="Advanced.DumpScriptedCamera" />
-        </menu_item_call>
-        <menu_item_separator
-         layout="topleft" />
         <menu_item_call
          label="Clear Group Cache"
          layout="topleft"
@@ -1863,7 +1560,7 @@
             <menu_item_call.on_click
              function="Advanced.ClearGroupCache"
              parameter="ClearGroupCache" />
-        </menu_item_call>      
+        </menu_item_call>
         <menu_item_check
          label="Mouse Smoothing"
          layout="topleft"
@@ -1878,7 +1575,7 @@
         <menu_item_separator
          layout="topleft" />
         <menu_item_call
-         label="Debug Settings editor"
+         label="Show Debug Settings"
          layout="topleft"
          name="Debug Settings">
             <menu_item_call.on_click
@@ -1886,7 +1583,7 @@
              parameter="all" />
         </menu_item_call>
      <menu_item_check
-         label="Activate Debug Mode (QA)"
+         label="Show Develop Menu"
          layout="topleft"
          name="Debug Mode"
          shortcut="control|alt|Q">
@@ -1900,9 +1597,9 @@
     </menu>
     <menu
      create_jump_keys="true"
-     label="Debug"
+     label="Develop"
      layout="topleft"
-     name="Debug"
+     name="Develop"
      tear_off="true"
      visible="false">
         <menu
@@ -1997,6 +1694,41 @@
                  function="Advanced.DumpInfoToConsole"
                  parameter="capabilities" />
             </menu_item_call>
+            <menu_item_separator
+         layout="topleft" />
+            <menu_item_check
+             label="Camera"
+             layout="topleft"
+             name="Camera">
+                <menu_item_check.on_check
+                 function="Advanced.CheckHUDInfo"
+                 parameter="camera" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleHUDInfo"
+                 parameter="camera" />
+            </menu_item_check>
+            <menu_item_check
+             label="Wind"
+             layout="topleft"
+             name="Wind">
+                <menu_item_check.on_check
+                 function="Advanced.CheckHUDInfo"
+                 parameter="wind" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleHUDInfo"
+                 parameter="wind" />
+            </menu_item_check>
+            <menu_item_check
+             label="FOV"
+             layout="topleft"
+             name="FOV">
+                <menu_item_check.on_check
+                 function="Advanced.CheckHUDInfo"
+                 parameter="fov" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleHUDInfo"
+                 parameter="fov" />
+            </menu_item_check>
         </menu>
         <menu
          create_jump_keys="true"
@@ -2051,7 +1783,7 @@
             <menu_item_separator
              layout="topleft" />
             <menu_item_check
-             label="Show Updates to objects"
+             label="Show Updates to Objects"
              layout="topleft"
              name="Show Updates"
              shortcut="control|alt|shift|U">
@@ -2317,8 +2049,6 @@
            parameter="raycast" />
         </menu_item_check>
       </menu>
-        <menu_item_separator
-         layout="topleft" />
         <menu
          create_jump_keys="true"
          label="Network"
@@ -2387,10 +2117,15 @@
                  function="Advanced.DropPacket" />
             </menu_item_call>
         </menu>
-        <menu_item_separator
-         layout="topleft" />
         <menu_item_call
-             label="Bumps, Pushes &amp; Hits..."
+         label="Dump Scripted Camera"
+         layout="topleft"
+         name="Dump Scripted Camera">
+            <menu_item_call.on_click
+             function="Advanced.DumpScriptedCamera" />
+        </menu_item_call>
+        <menu_item_call
+             label="Bumps, Pushes &amp; Hits"
              layout="topleft"
              name="Bumps, Pushes &amp;amp; Hits">
                 <menu_item_call.on_click
@@ -2408,92 +2143,279 @@
              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"
-         name="View Admin Options">
-            <menu_item_check.on_check
-             function="Advanced.CheckViewAdminOptions"
-             parameter="ViewAdminOptions" />
-            <menu_item_check.on_click
-             function="Advanced.ToggleViewAdminOptions" />
-        </menu_item_check>
-        <menu_item_call
-         label="Request Admin Status"
-         layout="topleft"
-         name="Request Admin Options"
-         shortcut="control|alt|G">
-            <menu_item_call.on_click
-             function="Advanced.RequestAdminStatus" />
-        </menu_item_call>
-        <menu_item_call
-         label="Deactivate Admin Status"
-         layout="topleft"
-         name="Leave Admin Options"
-         shortcut="control|alt|shift|G">
-            <menu_item_call.on_click
-             function="Advanced.LeaveAdminStatus" />
-        </menu_item_call>
-    </menu>
-    <menu
-     create_jump_keys="true"
-     label="Develop"
-     layout="topleft"
-     name="Develop"
-     tear_off="true"
-     visible="false">
         <menu
          create_jump_keys="true"
-         label="HUD Info"
+         label="Recorder"
          layout="topleft"
-         name="HUD Info"
+         name="Recorder"
          tear_off="true">
+            <menu_item_call
+             label="Start Playback"
+             layout="topleft"
+             name="Start Playback">
+                <menu_item_call.on_click
+                 function="Advanced.AgentPilot"
+                 parameter="start playback" />
+            </menu_item_call>
+            <menu_item_call
+             label="Stop Playback"
+             layout="topleft"
+             name="Stop Playback">
+                <menu_item_call.on_click
+                 function="Advanced.AgentPilot"
+                 parameter="stop playback" />
+            </menu_item_call>
             <menu_item_check
-             label="Camera"
+             label="Loop Playback"
              layout="topleft"
-             name="Camera">
+             name="Loop Playback">
                 <menu_item_check.on_check
-                 function="Advanced.CheckHUDInfo"
-                 parameter="camera" />
+                 function="Advanced.CheckAgentPilotLoop"
+                 parameter="loopPlayback" />
                 <menu_item_check.on_click
-                 function="Advanced.ToggleHUDInfo"
-                 parameter="camera" />
+                 function="Advanced.ToggleAgentPilotLoop" />
+            </menu_item_check>
+            <menu_item_call
+             label="Start Record"
+             layout="topleft"
+             name="Start Record">
+                <menu_item_call.on_click
+                 function="Advanced.AgentPilot"
+                 parameter="start record" />
+            </menu_item_call>
+            <menu_item_call
+             label="Stop Record"
+             layout="topleft"
+             name="Stop Record">
+                <menu_item_call.on_click
+                 function="Advanced.AgentPilot"
+                 parameter="stop record" />
+            </menu_item_call>
+        </menu>
+        <menu
+         label="Shortcuts"
+         layout="topleft"
+         name="Shortcuts"
+         tear_off="true"
+         visible="false">
+            <menu_item_check
+               label="Search"
+               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>
+            <menu_item_call
+             enabled="false"
+             label="Release Keys"
+             layout="topleft"
+             name="Release Keys">
+                <menu_item_call.on_click
+                 function="Tools.ReleaseKeys"
+                 parameter="" />
+                <menu_item_call.on_enable
+                 function="Tools.EnableReleaseKeys"
+                 parameter="" />
+            </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
+             layout="topleft" />
             <menu_item_check
-             label="Wind"
+             label="Always Run"
              layout="topleft"
-             name="Wind">
+             name="Always Run"
+             shortcut="control|R">
                 <menu_item_check.on_check
-                 function="Advanced.CheckHUDInfo"
-                 parameter="wind" />
+                 function="World.CheckAlwaysRun" />
                 <menu_item_check.on_click
-                 function="Advanced.ToggleHUDInfo"
-                 parameter="wind" />
+                 function="World.AlwaysRun" />
             </menu_item_check>
             <menu_item_check
-             label="FOV"
+             label="Fly"
              layout="topleft"
-             name="FOV">
+             name="Fly"
+             shortcut="Home">
+                <menu_item_check.on_click
+                 function="Agent.toggleFlying" />
+                <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
+             label="Snapshot to Disk"
+             layout="topleft"
+             name="Snapshot to Disk"
+             shortcut="control|`"
+             use_mac_ctrl="true">
+                <menu_item_call.on_click
+                 function="File.TakeSnapshotToDisk" />
+            </menu_item_call>
+            <menu_item_separator
+             layout="topleft" />
+            <menu_item_call
+             label="Mouselook"
+             layout="topleft"
+             name="Mouselook"
+             shortcut="M">
+                <menu_item_call.on_click
+                 function="View.Mouselook" />
+                <menu_item_call.on_enable
+                 function="View.EnableMouselook" />
+            </menu_item_call>
+            <menu_item_check
+             label="Joystick Flycam"
+             layout="topleft"
+             name="Joystick Flycam"
+             shortcut="alt|shift|F">
                 <menu_item_check.on_check
-                 function="Advanced.CheckHUDInfo"
-                 parameter="fov" />
+                 function="View.CheckJoystickFlycam" />
                 <menu_item_check.on_click
-                 function="Advanced.ToggleHUDInfo"
-                 parameter="fov" />
+                 function="View.JoystickFlycam" />
+                <menu_item_check.on_enable
+                 function="View.EnableJoystickFlycam" />
             </menu_item_check>
+            <menu_item_call
+             label="Reset View"
+             layout="topleft"
+             name="Reset View"
+             shortcut="Esc">
+                <menu_item_call.on_click
+                 function="View.ResetView" />
+            </menu_item_call>
+            <menu_item_call
+             label="Look at Last Chatter"
+             layout="topleft"
+             name="Look at Last Chatter"
+             shortcut="control|\">
+                <menu_item_call.on_click
+                 function="View.LookAtLastChatter" />
+                <menu_item_call.on_enable
+                 function="View.EnableLastChatter" />
+            </menu_item_call>
+            <menu_item_separator
+             layout="topleft" />
+            <menu
+             create_jump_keys="true"
+             label="Select Tool"
+             layout="topleft"
+             name="Select Tool"
+             tear_off="true">
+                <menu_item_call
+                 label="Focus"
+                 layout="topleft"
+                 name="Focus"
+                 shortcut="control|1">
+                    <menu_item_call.on_click
+                     function="Tools.SelectTool"
+                     parameter="focus" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Move"
+                 layout="topleft"
+                 name="Move"
+                 shortcut="control|2">
+                    <menu_item_call.on_click
+                     function="Tools.SelectTool"
+                     parameter="move" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Edit"
+                 layout="topleft"
+                 name="Edit"
+                 shortcut="control|3">
+                    <menu_item_call.on_click
+                     function="Tools.SelectTool"
+                     parameter="edit" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Create"
+                 layout="topleft"
+                 name="Create"
+                 shortcut="control|4">
+                    <menu_item_call.on_click
+                     function="Tools.SelectTool"
+                     parameter="create" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Land"
+                 layout="topleft"
+                 name="Land"
+                 shortcut="control|5">
+                    <menu_item_call.on_click
+                     function="Tools.SelectTool"
+                     parameter="land" />
+                </menu_item_call>
+            </menu>
+            <menu_item_separator
+             layout="topleft" />
+            <menu_item_call
+             label="Zoom In"
+             layout="topleft"
+             name="Zoom In"
+             shortcut="control|0">
+                <menu_item_call.on_click
+                 function="View.ZoomIn" />
+            </menu_item_call>
+            <menu_item_call
+             label="Zoom Default"
+             layout="topleft"
+             name="Zoom Default"
+             shortcut="control|9">
+                <menu_item_call.on_click
+                 function="View.ZoomDefault" />
+            </menu_item_call>
+            <menu_item_call
+             label="Zoom Out"
+             layout="topleft"
+             name="Zoom Out"
+             shortcut="control|8">
+                <menu_item_call.on_click
+                 function="View.ZoomOut" />
+            </menu_item_call>
+            <menu_item_separator
+             layout="topleft" />
+            <menu_item_call
+             label="Toggle Fullscreen"
+             layout="topleft"
+             name="Toggle Fullscreen"
+             shortcut="alt|Enter">
+                <menu_item_call.on_click
+                 function="View.Fullscreen" />
+            </menu_item_call>
         </menu>
         <menu
          create_jump_keys="true"
@@ -2587,9 +2509,7 @@
             <menu_item_check.on_enable
                  function="Advanced.EnableRenderDeferredGI" />
           </menu_item_check>
-          
           <menu_item_separator />
-          
           <menu_item_check
              label="Debug GL"
              name="Debug GL">
@@ -2732,7 +2652,7 @@
          layout="topleft"
          name="UI"
          tear_off="true">
-            <menu_item_check
+         <!--   <menu_item_check
              label="New Bottom Bar"
              layout="topleft"
              name="New Bottom Bar">
@@ -2742,27 +2662,16 @@
                 <menu_item_check.on_click
                  function="ToggleControl"
                  parameter="BottomPanelNew" />
-            </menu_item_check>
+            </menu_item_check>-->
             <menu_item_call
              label="Web Browser Test"
              layout="topleft"
              name="Web Browser Test">
                 <menu_item_call.on_click
-                 function="Advanced.WebBrowserTest" 
+                 function="Advanced.WebBrowserTest"
                  parameter="http://secondlife.com/app/search/slurls.html"/>
             </menu_item_call>
             <menu_item_call
-             label="UI/Color Settings"
-             layout="topleft"
-             name="UI/Color Settings">
-                <menu_item_call.on_click
-                 function="Advanced.ShowDebugSettings"
-                 parameter="skin" />
-            </menu_item_call>
-          
-            <menu_item_separator />
-          
-            <menu_item_call
              label="Dump SelectMgr"
              layout="topleft"
              name="Dump SelectMgr">
@@ -2825,9 +2734,8 @@
                  function="ToggleControl"
                  parameter="DoubleClickAutoPilot" />
             </menu_item_check>
-          
+
             <menu_item_separator />
-          
             <menu_item_check
              label="Debug SelectMgr"
              layout="topleft"
@@ -2963,7 +2871,7 @@
         </menu>
         <menu
          create_jump_keys="true"
-         label="Character"
+         label="Avatar"
          layout="topleft"
          name="Character"
          tear_off="true">
@@ -3247,6 +3155,32 @@
              function="ToggleControl"
              parameter="ShowConsoleWindow" />
         </menu_item_check>
+        <menu_item_check
+         label="Show Admin Menu"
+         layout="topleft"
+         name="View Admin Options">
+            <menu_item_check.on_check
+             function="Advanced.CheckViewAdminOptions"
+             parameter="ViewAdminOptions" />
+            <menu_item_check.on_click
+             function="Advanced.ToggleViewAdminOptions" />
+        </menu_item_check>
+        <menu_item_call
+         label="Request Admin Status"
+         layout="topleft"
+         name="Request Admin Options"
+         shortcut="control|alt|G">
+            <menu_item_call.on_click
+             function="Advanced.RequestAdminStatus" />
+        </menu_item_call>
+        <menu_item_call
+         label="Leave Admin Status"
+         layout="topleft"
+         name="Leave Admin Options"
+         shortcut="control|alt|shift|G">
+            <menu_item_call.on_click
+             function="Advanced.LeaveAdminStatus" />
+        </menu_item_call>
     </menu>
     <menu
      create_jump_keys="true"