From e254aa6dc6dcd3ba7369de5231dec16a570701a8 Mon Sep 17 00:00:00 2001
From: Richard Nelson <none@none>
Date: Thu, 1 Apr 2010 12:06:16 -0700
Subject: [PATCH] EXT-3531 - Ctrl-P does not work reliably on login deprecated
 handle_edit_keys_directly and moved edit menu out of menu_viewer and
 menu_login

---
 .../default/xui/en/alert_line_editor.xml      |   1 -
 .../default/xui/en/floater_about_land.xml     |   1 -
 .../skins/default/xui/en/floater_buy_land.xml |   1 -
 .../default/xui/en/floater_outfit_save_as.xml |   1 -
 .../xui/en/floater_preview_notecard.xml       |   1 -
 .../default/xui/en/floater_ui_preview.xml     |   3 -
 .../xui/en/floater_wearable_save_as.xml       |   1 -
 .../skins/default/xui/en/menu_login.xml       | 135 +---
 .../skins/default/xui/en/menu_viewer.xml      | 582 ++----------------
 .../skins/default/xui/en/panel_login.xml      |   3 -
 .../default/xui/en/panel_place_profile.xml    |   1 -
 .../xui/en/panel_preferences_setup.xml        |   1 -
 .../default/xui/en/panel_region_covenant.xml  |   1 -
 .../skins/default/xui/en/panel_script_ed.xml  |   1 -
 .../default/xui/en/widgets/line_editor.xml    |   1 -
 15 files changed, 87 insertions(+), 647 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/alert_line_editor.xml b/indra/newview/skins/default/xui/en/alert_line_editor.xml
index 97991153d88..82bf5fc8dad 100644
--- a/indra/newview/skins/default/xui/en/alert_line_editor.xml
+++ b/indra/newview/skins/default/xui/en/alert_line_editor.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <line_editor
   select_on_focus="false"
-  handle_edit_keys_directly="false"
   revert_on_esc="true"
   commit_on_focus_lost="true"
   ignore_tab="true"
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 51bd7a0a167..59f18898081 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -636,7 +636,6 @@ Leyla Linden               </text>
              length="1"
              enabled="false"
              follows="all"
-             handle_edit_keys_directly="true"
              height="200"
              layout="topleft"
              left="10"
diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml
index 125b0805196..df44b616327 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml
@@ -356,7 +356,6 @@ supports [AMOUNT2] objects
      length="1"
      enabled="false"
      follows="top|right"
-     handle_edit_keys_directly="false" 
      height="237"
      layout="topleft"
      left="444"
diff --git a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml
index a2938e85744..1d73d516d0b 100644
--- a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml
@@ -45,7 +45,6 @@ as a new Outfit:
      border_style="line"
      border_thickness="1"
      follows="left|top"
-     handle_edit_keys_directly="true"
      height="23"
      layout="topleft"
      left_delta="0"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
index e9099211a33..14c0081c0df 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
@@ -72,7 +72,6 @@
      max_length="65536"
      name="Notecard Editor"
      allow_html="false" 
-     handle_edit_keys_directly="true"
      tab_group="1"
      top="46"
      width="392"
diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
index 3a981adfdf7..3b10a57c500 100644
--- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
@@ -238,7 +238,6 @@
              border_thickness="1"
              follows="left|bottom"
              font="SansSerif"
-             handle_edit_keys_directly="true"
              height="20"
              layout="topleft"
              left_delta="100"
@@ -278,7 +277,6 @@
              border_thickness="1"
              follows="left|bottom"
              font="SansSerif"
-             handle_edit_keys_directly="true"
              height="20"
              layout="topleft"
              left_delta="100"
@@ -320,7 +318,6 @@
              border_thickness="1"
              follows="left|bottom"
              font="SansSerif"
-             handle_edit_keys_directly="true"
              height="20"
              layout="topleft"
              left_delta="65"
diff --git a/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml
index b4b57f2dbc6..71812bd1a67 100644
--- a/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml
+++ b/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml
@@ -44,7 +44,6 @@
      border_style="line"
      border_thickness="1"
      follows="left|top"
-     handle_edit_keys_directly="true"
      height="23"
      layout="topleft"
      left_delta="0"
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index ba741045944..4655fa8c460 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -29,14 +29,6 @@
              function="File.Quit" />
         </menu_item_call>
     </menu>
-<!-- Edit menu merged into the Me menu above
-    <menu
-     create_jump_keys="true"
-     label="Edit"
-     name="Edit"
-     width="153">
-    </menu>
--->
     <menu
      create_jump_keys="true"
      label="Help"
@@ -59,105 +51,24 @@
              parameter="sl_about" />
         </menu_item_call>
     </menu>
+    <menu_item_check
+      label="Show Debug Menu"
+      name="Show Debug Menu"
+      visible="false" 
+      shortcut="control|alt|D">
+      <on_check
+       function="CheckControl"
+       parameter="UseDebugMenus" />
+      <on_click
+       function="ToggleControl"
+       parameter="UseDebugMenus" />
+    </menu_item_check>
     <menu
       visible="false"
      create_jump_keys="true"
      label="Debug"
      name="Debug"
      tear_off="true">
-      <!-- Need a copy of the edit menu here so keyboard shortcuts like
-           control-C work to copy text at login screen and About dialog (for QA)
-      -->
-      <menu
-       create_jump_keys="true"
-       label="Edit"
-       name="Edit"
-       tear_off="true">
-        <menu_item_call
-         label="Undo"
-         name="Undo"
-         shortcut="control|Z">
-          <menu_item_call.on_click
-           function="Edit.Undo" />
-          <menu_item_call.on_enable
-           function="Edit.EnableUndo" />
-        </menu_item_call>
-        <menu_item_call
-         label="Redo"
-         name="Redo"
-         shortcut="control|Y">
-          <menu_item_call.on_click
-           function="Edit.Redo" />
-          <menu_item_call.on_enable
-           function="Edit.EnableRedo" />
-        </menu_item_call>
-        <menu_item_separator />
-        <menu_item_call
-         label="Cut"
-         name="Cut"
-         shortcut="control|X">
-          <menu_item_call.on_click
-           function="Edit.Cut" />
-          <menu_item_call.on_enable
-           function="Edit.EnableCut" />
-        </menu_item_call>
-        <menu_item_call
-         label="Copy"
-         name="Copy"
-         shortcut="control|C">
-          <menu_item_call.on_click
-           function="Edit.Copy" />
-          <menu_item_call.on_enable
-           function="Edit.EnableCopy" />
-        </menu_item_call>
-        <menu_item_call
-         label="Paste"
-         name="Paste"
-         shortcut="control|V">
-          <menu_item_call.on_click
-           function="Edit.Paste" />
-          <menu_item_call.on_enable
-           function="Edit.EnablePaste" />
-        </menu_item_call>
-        <menu_item_call
-         label="Delete"
-         name="Delete"
-         shortcut="Del">
-          <menu_item_call.on_click
-           function="Edit.Delete" />
-          <menu_item_call.on_enable
-           function="Edit.EnableDelete" />
-        </menu_item_call>
-        <menu_item_call
-         label="Duplicate"
-         name="Duplicate"
-         shortcut="control|D">
-          <menu_item_call.on_click
-           function="Edit.Duplicate" />
-          <menu_item_call.on_enable
-           function="Edit.EnableDuplicate" />
-        </menu_item_call>
-        <menu_item_separator />
-        <menu_item_call
-         label="Select All"
-         name="Select All"
-         shortcut="control|A">
-          <menu_item_call.on_click
-           function="Edit.SelectAll" />
-          <menu_item_call.on_enable
-           function="Edit.EnableSelectAll" />
-        </menu_item_call>
-        <menu_item_call
-         label="Deselect"
-         name="Deselect"
-         shortcut="control|E">
-          <menu_item_call.on_click
-           function="Edit.Deselect" />
-          <menu_item_call.on_enable
-           function="Edit.EnableDeselect" />
-        </menu_item_call>
-      </menu>
-      <menu_item_separator />
       <menu_item_call
          label="Show Debug Settings"
          name="Debug Settings">
@@ -270,5 +181,27 @@
            function="Advanced.WebBrowserTest"
            parameter="http://join.secondlife.com/"/>
         </menu_item_call>
+      <menu_item_separator/>
+      <menu_item_check
+        label="Show Grid Picker"
+        name="Show Grid Picker"
+        visible="false" 
+        shortcut="control|shift|G">
+        <on_check
+         function="CheckControl"
+         parameter="ForceShowGrid" />
+        <on_click
+         function="ToggleControl"
+         parameter="ForceShowGrid" />
+      </menu_item_check>
+      <menu_item_call
+        label="Show Notifications Console"
+        name="Show Notifications Console"
+        visible="false"
+        shortcut="control|shift|5">
+        <on_click
+         function="Floater.Toggle"
+         parameter="notifications_console" />
+      </menu_item_call>
     </menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index a08bc160661..43f594ca5af 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2,16 +2,13 @@
 <menu_bar
  bg_visible="false"
  follows="left|top|right"
- layout="topleft"
  name="Main Menu">
     <menu
      label="Me"
-     layout="topleft"
      name="Me"
      tear_off="true">
         <menu_item_call
          label="Preferences"
-         layout="topleft"
          name="Preferences"
          shortcut="control|P">
             <menu_item_call.on_click
@@ -20,7 +17,6 @@
         </menu_item_call>
          <menu_item_call
              label="My Dashboard"
-             layout="topleft"
              name="Manage My Account">
                 <menu_item_call.on_click
                  function="PromptShowURL"
@@ -29,16 +25,13 @@
       </menu_item_call>
         <menu_item_call
          label="Buy L$"
-         layout="topleft"
          name="Buy and Sell L$">
             <menu_item_call.on_click
              function="BuyCurrency" />
         </menu_item_call>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
         <menu_item_call
          label="My Profile"
-         layout="topleft"
          name="Profile">
             <menu_item_call.on_click
              function="ShowAgentProfile"
@@ -46,7 +39,6 @@
         </menu_item_call>
         <menu_item_call
          label="My Appearance"
-         layout="topleft"
          name="Appearance">
             <menu_item_call.on_click
              function="CustomizeAvatar" />
@@ -56,7 +48,6 @@
         <menu_item_check
          label="My Inventory"
          name="Inventory"
-         layout="topleft"
          shortcut="control|shift|I"
 		 visible="false">
             <menu_item_check.on_check
@@ -69,7 +60,6 @@
         <menu_item_check
          label="My Inventory"
          name="ShowSidetrayInventory"
-         layout="topleft"
          shortcut="control|I"
 		 visible="true">
             <menu_item_check.on_check
@@ -81,7 +71,6 @@
         </menu_item_check>
         <menu_item_check
          label="My Gestures"
-         layout="topleft"
          name="Gestures"
          shortcut="control|G">
             <menu_item_check.on_check
@@ -93,21 +82,17 @@
         </menu_item_check>
         <menu
          label="My Status"
-         layout="topleft"
          name="Status"
          tear_off="true">
             <menu_item_call
              label="Away"
-             layout="topleft"
              name="Set Away">
                 <menu_item_call.on_click
                  function="World.SetAway" />
             </menu_item_call>
-            <menu_item_separator
-             layout="topleft"/>
+          <menu_item_separator/>
             <menu_item_call
              label="Busy"
-             layout="topleft"
              name="Set Busy">
                 <menu_item_call.on_click
                  function="World.SetBusy"/>
@@ -115,7 +100,6 @@
         </menu>
         <menu_item_call
          label="Request Admin Status"
-         layout="topleft"
          name="Request Admin Options"
          shortcut="control|alt|G"
 		 visible="false">
@@ -124,18 +108,15 @@
         </menu_item_call>
         <menu_item_call
          label="Leave Admin Status"
-         layout="topleft"
          name="Leave Admin Options"
          shortcut="control|alt|shift|G"
 		 visible="false">
             <menu_item_call.on_click
              function="Advanced.LeaveAdminStatus" />
         </menu_item_call>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
         <menu_item_call
          label="Quit [APP_NAME]"
-         layout="topleft"
          name="Quit"
          shortcut="control|Q">
             <menu_item_call.on_click
@@ -144,12 +125,10 @@
     </menu>
     <menu
      label="Communicate"
-     layout="topleft"
      name="Communicate"
      tear_off="true">
         <menu_item_call
          label="My Friends"
-         layout="topleft"
          name="My Friends"
          shortcut="control|shift|F">
             <menu_item_call.on_click
@@ -158,24 +137,20 @@
             </menu_item_call>
         <menu_item_call
          label="My Groups"
-         layout="topleft"
          name="My Groups">
             <menu_item_call.on_click
              function="SideTray.PanelPeopleTab"
              parameter="groups_panel" />
         </menu_item_call>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
         <!--menu_item_call
          label="Chat"
-         layout="topleft"
          name="Chat">
             <menu_item_call.on_click
              function="World.Chat" />
         </menu_item_call-->
         <menu_item_check
          label="Nearby Chat"
-         layout="topleft"
          name="Nearby Chat"
          shortcut="control|H"
          use_mac_ctrl="true">
@@ -188,7 +163,6 @@
         </menu_item_check>
         <menu_item_call
          label="Nearby People"
-         layout="topleft"
          name="Active Speakers"
          shortcut="control|shift|A">
             <menu_item_call.on_click
@@ -198,12 +172,10 @@
     </menu>
     <menu
      label="World"
-     layout="topleft"
      name="World"
      tear_off="true">
             <menu_item_check
          label="Mini-Map"
-         layout="topleft"
          name="Mini-Map"
          shortcut="control|shift|M">
             <menu_item_check.on_check
@@ -215,7 +187,6 @@
         </menu_item_check>
          <menu_item_check
          label="World Map"
-         layout="topleft"
          name="World Map"
          shortcut="control|M"
          use_mac_ctrl="true">
@@ -228,7 +199,6 @@
         </menu_item_check>
         <menu_item_call
          label="Snapshot"
-         layout="topleft"
          name="Take Snapshot"
          shortcut="control|shift|S">
             <menu_item_call.on_click
@@ -237,7 +207,6 @@
         </menu_item_call>
       <menu_item_call
              label="Landmark This Place"
-             layout="topleft"
              name="Create Landmark Here">
                 <menu_item_call.on_click
                  function="World.CreateLandmark" />
@@ -247,12 +216,10 @@
       <menu
            create_jump_keys="true"
            label="Place Profile"
-           layout="topleft"
            name="Land"
            tear_off="true">
         <menu_item_call
          label="About Land"
-         layout="topleft"
          name="About Land">
             <menu_item_call.on_click
              function="Floater.Show"
@@ -260,18 +227,15 @@
         </menu_item_call>
         <menu_item_call
          label="Region/Estate"
-         layout="topleft"
          name="Region/Estate">
             <menu_item_call.on_click
              function="Floater.Show"
              parameter="region_info" />
         </menu_item_call>
         </menu>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
         <menu_item_call
              label="Buy This Land"
-             layout="topleft"
              name="Buy Land">
                 <menu_item_call.on_click
                  function="Land.Buy" />
@@ -280,7 +244,6 @@
             </menu_item_call>
         <menu_item_call
              label="My Land"
-             layout="topleft"
              name="My Land">
                 <menu_item_call.on_click
                  function="Floater.Show"
@@ -289,12 +252,10 @@
         <menu
            create_jump_keys="true"
            label="Show"
-           layout="topleft"
            name="LandShow"
            tear_off="true">
          <menu_item_check
          label="Move Controls"
-         layout="topleft"
          name="Movement Controls">
             <menu_item_check.on_check
              function="Floater.Visible"
@@ -304,7 +265,6 @@
         </menu_item_check>
         <menu_item_check
          label="View Controls"
-         layout="topleft"
          name="Camera Controls">
             <menu_item_check.on_check
              function="Floater.Visible"
@@ -314,7 +274,6 @@
         </menu_item_check>
           <menu_item_check
              label="Ban Lines"
-             layout="topleft"
              name="Ban Lines">
             <menu_item_check.on_check
                control="ShowBanLines" />
@@ -324,7 +283,6 @@
           </menu_item_check>
            <menu_item_check
                  label="Beacons"
-                 layout="topleft"
                  name="beacons"
                  shortcut="control|alt|shift|N">
                     <menu_item_check.on_check
@@ -336,7 +294,6 @@
                 </menu_item_check>
           <menu_item_check
              label="Property Lines"
-             layout="topleft"
              name="Property Lines"
              shortcut="control|alt|shift|P">
             <menu_item_check.on_check
@@ -347,7 +304,6 @@
           </menu_item_check>
           <menu_item_check
              label="Land Owners"
-             layout="topleft"
              name="Land Owners">
             <menu_item_check.on_check
                control="ShowParcelOwners" />
@@ -374,11 +330,9 @@
                control="NavBarShowParcelProperties" />
           </menu_item_check>
         </menu>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
 	    <menu_item_call
 	     label="Teleport Home"
-	     layout="topleft"
 	     name="Teleport Home"
 	     shortcut="control|shift|H">
 		<menu_item_call.on_click
@@ -388,7 +342,6 @@
 	    </menu_item_call>
             <menu_item_call
              label="Set Home to Here"
-             layout="topleft"
              name="Set Home to Here">
                 <menu_item_call.on_click
                  function="World.SetHomeLocation" />
@@ -397,7 +350,6 @@
             </menu_item_call>
     <!--    <menu_item_check
          label="Show Navigation Bar"
-         layout="topleft"
          name="ShowNavbarNavigationPanel">
            <menu_item_check.on_click
              function="ToggleControl"
@@ -408,7 +360,6 @@
         </menu_item_check>
        <menu_item_check
          label="Show Favorites Bar"
-         layout="topleft"
          name="ShowNavbarFavoritesPanel">
            <menu_item_check.on_click
              function="ToggleControl"
@@ -417,19 +368,15 @@
              function="CheckControl"
              parameter="ShowNavbarFavoritesPanel" />
         </menu_item_check>
-        <menu_item_separator
-         layout="topleft" />-->
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
+        <menu_item_separator/>
     <menu
          create_jump_keys="true"
          label="Sun"
-         layout="topleft"
          name="Environment Settings"
          tear_off="true">
             <menu_item_call
              label="Sunrise"
-             layout="topleft"
              name="Sunrise">
                 <menu_item_call.on_click
                  function="World.EnvSettings"
@@ -437,7 +384,6 @@
             </menu_item_call>
             <menu_item_call
              label="Midday"
-             layout="topleft"
              name="Noon"
              shortcut="control|shift|Y">
                 <menu_item_call.on_click
@@ -446,7 +392,6 @@
             </menu_item_call>
             <menu_item_call
              label="Sunset"
-             layout="topleft"
              name="Sunset"
              shortcut="control|shift|N">
                 <menu_item_call.on_click
@@ -455,7 +400,6 @@
             </menu_item_call>
             <menu_item_call
              label="Midnight"
-             layout="topleft"
              name="Midnight">
                 <menu_item_call.on_click
                  function="World.EnvSettings"
@@ -463,17 +407,14 @@
             </menu_item_call>
             <menu_item_call
              label="Estate Time"
-             layout="topleft"
              name="Revert to Region Default">
                 <menu_item_call.on_click
                  function="World.EnvSettings"
                  parameter="default" />
             </menu_item_call>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_call
              label="Environment Editor"
-             layout="topleft"
              name="Environment Editor">
                 <menu_item_call.on_click
                  function="World.EnvSettings"
@@ -484,13 +425,11 @@
     <menu
      create_jump_keys="true"
      label="Build"
-     layout="topleft"
      name="BuildTools"
      tear_off="true"
      visible="true">
        <menu_item_check
          label="Build"
-         layout="topleft"
          name="Show Build Tools"
          shortcut="control|B">
             <menu_item_check.on_check
@@ -503,12 +442,10 @@
        <menu
           create_jump_keys="true"
           label="Select Build Tool"
-          layout="topleft"
           name="Select Tool"
           tear_off="true">
          <menu_item_call
 			label="Focus Tool"
-			layout="topleft"
 			name="Focus"
 			shortcut="control|1">
            <menu_item_call.on_click
@@ -517,7 +454,6 @@
          </menu_item_call>
          <menu_item_call
 			label="Move Tool"
-			layout="topleft"
 			name="Move"
 			shortcut="control|2">
            <menu_item_call.on_click
@@ -526,7 +462,6 @@
          </menu_item_call>
          <menu_item_call
 			label="Edit Tool"
-			layout="topleft"
 			name="Edit"
 			shortcut="control|3">
            <menu_item_call.on_click
@@ -535,7 +470,6 @@
          </menu_item_call>
          <menu_item_call
 			label="Create Tool"
-			layout="topleft"
 			name="Create"
 			shortcut="control|4">
            <menu_item_call.on_click
@@ -544,7 +478,6 @@
          </menu_item_call>
          <menu_item_call
 			label="Land Tool"
-			layout="topleft"
 			name="Land"
 			shortcut="control|5">
            <menu_item_call.on_click
@@ -552,112 +485,8 @@
               parameter="land" />
          </menu_item_call>
 	   </menu>
-        <menu
-         create_jump_keys="true"
-         label="Edit"
-         layout="topleft"
-         name="Edit"
-         tear_off="true">
-            <menu_item_call
-             label="Undo"
-             layout="topleft"
-             name="Undo"
-             shortcut="control|Z">
-                <menu_item_call.on_click
-                 function="Edit.Undo" />
-                <menu_item_call.on_enable
-                 function="Edit.EnableUndo" />
-            </menu_item_call>
-            <menu_item_call
-             label="Redo"
-             layout="topleft"
-             name="Redo"
-             shortcut="control|Y">
-                <menu_item_call.on_click
-                 function="Edit.Redo" />
-                <menu_item_call.on_enable
-                 function="Edit.EnableRedo" />
-            </menu_item_call>
-            <menu_item_separator
-             layout="topleft" />
-            <menu_item_call
-             label="Cut"
-             layout="topleft"
-             name="Cut"
-             shortcut="control|X">
-                <menu_item_call.on_click
-                 function="Edit.Cut" />
-                <menu_item_call.on_enable
-                 function="Edit.EnableCut" />
-            </menu_item_call>
-            <menu_item_call
-             label="Copy"
-             layout="topleft"
-             name="Copy"
-             shortcut="control|C">
-                <menu_item_call.on_click
-                 function="Edit.Copy" />
-                <menu_item_call.on_enable
-                 function="Edit.EnableCopy" />
-            </menu_item_call>
-            <menu_item_call
-             label="Paste"
-             layout="topleft"
-             name="Paste"
-             shortcut="control|V">
-                <menu_item_call.on_click
-                 function="Edit.Paste" />
-                <menu_item_call.on_enable
-                 function="Edit.EnablePaste" />
-            </menu_item_call>
-            <menu_item_call
-             label="Delete"
-             layout="topleft"
-             name="Delete"
-             shortcut="Del">
-                <menu_item_call.on_click
-                 function="Edit.Delete" />
-                <menu_item_call.on_enable
-                 function="Edit.EnableDelete" />
-            </menu_item_call>
-            <menu_item_call
-             label="Duplicate"
-             layout="topleft"
-             name="Duplicate"
-             shortcut="control|D">
-                <menu_item_call.on_click
-                 function="Edit.Duplicate" />
-                <menu_item_call.on_enable
-                 function="Edit.EnableDuplicate" />
-            </menu_item_call>
-            <menu_item_separator
-             layout="topleft" />
-            <menu_item_call
-             label="Select All"
-             layout="topleft"
-             name="Select All"
-             shortcut="control|A">
-                <menu_item_call.on_click
-                 function="Edit.SelectAll" />
-                <menu_item_call.on_enable
-                 function="Edit.EnableSelectAll" />
-            </menu_item_call>
-            <menu_item_call
-             label="Deselect"
-             layout="topleft"
-             name="Deselect"
-             shortcut="control|E">
-                <menu_item_call.on_click
-                 function="Edit.Deselect" />
-                <menu_item_call.on_enable
-                 function="Edit.EnableDeselect" />
-            </menu_item_call>
-        </menu>
-        <menu_item_separator
-           layout="topleft" />
         <menu_item_call
            label="Link"
-           layout="topleft"
            name="Link"
            shortcut="control|L">
           <menu_item_call.on_click
@@ -667,7 +496,6 @@
         </menu_item_call>
         <menu_item_call
            label="Unlink"
-           layout="topleft"
            name="Unlink"
            shortcut="control|shift|L">
           <menu_item_call.on_click
@@ -677,7 +505,6 @@
         </menu_item_call>
         <menu_item_check
              label="Edit Linked Parts"
-             layout="topleft"
              name="Edit Linked Parts">
                 <menu_item_check.on_check
                  control="EditLinkedParts" />
@@ -687,11 +514,9 @@
                 <menu_item_check.on_enable
                  function="Tools.EnableToolNotPie" />
             </menu_item_check>
-        <menu_item_separator
-           layout="topleft" />
+        <menu_item_separator/>
         <menu_item_call
            label="Focus on Selection"
-           layout="topleft"
            name="Focus on Selection"
            shortcut="H">
           <menu_item_call.on_click
@@ -702,7 +527,6 @@
         </menu_item_call>
         <menu_item_call
            label="Zoom to Selection"
-           layout="topleft"
            name="Zoom to Selection"
            shortcut="shift|H">
           <menu_item_call.on_click
@@ -711,17 +535,14 @@
           <menu_item_call.on_enable
              function="Tools.SomethingSelectedNoHUD" />
         </menu_item_call>
-        <menu_item_separator
-           layout="topleft" />
+        <menu_item_separator/>
         <menu
          create_jump_keys="true"
          label="Object"
-         layout="topleft"
          name="Object"
          tear_off="true">
           <menu_item_call
              label="Buy"
-             layout="topleft"
              name="Menu Object Buy">
             <menu_item_call.on_click
                function="Tools.BuyOrTake"/>
@@ -732,7 +553,6 @@
           </menu_item_call>
           <menu_item_call
              label="Take"
-             layout="topleft"
              name="Menu Object Take">
             <menu_item_call.on_click
                function="Tools.BuyOrTake"/>
@@ -743,7 +563,6 @@
           </menu_item_call>
           <menu_item_call
 			 label="Take Copy"
-			 layout="topleft"
 			 name="Take Copy">
 			<menu_item_call.on_click
                function="Tools.TakeCopy" />
@@ -752,7 +571,6 @@
           </menu_item_call>
           <menu_item_call
 			 label="Save Back to My Inventory"
-			 layout="topleft"
 			 name="Save Object Back to My Inventory">
 			<menu_item_call.on_click
                function="Tools.SaveToInventory" />
@@ -761,7 +579,6 @@
           </menu_item_call>
           <menu_item_call
 			 label="Save Back to Object Contents"
-			 layout="topleft"
 			 name="Save Object Back to Object Contents">
 			<menu_item_call.on_click
                function="Tools.SaveToObjectInventory" />
@@ -772,12 +589,10 @@
         <menu
            create_jump_keys="true"
            label="Scripts"
-           layout="topleft"
            name="Scripts"
            tear_off="true">
           <menu_item_call
              label="Recompile Scripts (Mono)"
-             layout="topleft"
              name="Mono">
             <menu_item_call.on_click
                function="Tools.SelectedScriptAction"
@@ -787,7 +602,6 @@
           </menu_item_call>
           <menu_item_call
              label="Recompile Scripts (LSL)"
-             layout="topleft"
              name="LSL">
             <menu_item_call.on_click
                function="Tools.SelectedScriptAction"
@@ -797,7 +611,6 @@
           </menu_item_call>
           <menu_item_call
              label="Reset Scripts"
-             layout="topleft"
              name="Reset Scripts">
             <menu_item_call.on_click
                function="Tools.SelectedScriptAction"
@@ -807,7 +620,6 @@
           </menu_item_call>
           <menu_item_call
              label="Set Scripts to Running"
-             layout="topleft"
              name="Set Scripts to Running">
             <menu_item_call.on_click
                function="Tools.SelectedScriptAction"
@@ -817,7 +629,6 @@
           </menu_item_call>
           <menu_item_call
              label="Set Scripts to Not Running"
-             layout="topleft"
              name="Set Scripts to Not Running">
             <menu_item_call.on_click
                function="Tools.SelectedScriptAction"
@@ -826,17 +637,14 @@
                function="EditableSelected" />
           </menu_item_call>
         </menu>
-        <menu_item_separator
-           layout="topleft" />
+        <menu_item_separator/>
         <menu
          create_jump_keys="true"
          label="Options"
-         layout="topleft"
          name="Options"
          tear_off="true">
             <menu_item_call
              label="Set Default Upload Permissions"
-             layout="topleft"
              name="perm prefs">
                 <menu_item_call.on_click
                  function="Floater.Toggle"
@@ -844,7 +652,6 @@
             </menu_item_call>
 	   <menu_item_check
 	       label="Show Advanced Permissions"
-	       layout="topleft"
 	       name="DebugPermissions">
 			  <menu_item_check.on_check
 				 function="CheckControl"
@@ -853,11 +660,9 @@
 				 function="ToggleControl"
 				 parameter="DebugPermissions" />
 			</menu_item_check>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_check
                  label="Select Only My Objects"
-                 layout="topleft"
                  name="Select Only My Objects">
                     <menu_item_check.on_check
                      control="SelectOwnedOnly" />
@@ -867,7 +672,6 @@
                 </menu_item_check>
                 <menu_item_check
                  label="Select Only Movable Objects"
-                 layout="topleft"
                  name="Select Only Movable Objects">
                     <menu_item_check.on_check
                      control="SelectMovableOnly" />
@@ -877,18 +681,15 @@
                 </menu_item_check>
                 <menu_item_check
                  label="Select By Surrounding"
-                 layout="topleft"
                  name="Select By Surrounding">
                     <menu_item_check.on_check
                      control="RectangleSelectInclusive" />
                     <menu_item_check.on_click
                      function="Tools.SelectBySurrounding" />
             </menu_item_check>
-          <menu_item_separator
-           layout="topleft" />
+          <menu_item_separator/>
                 <menu_item_check
                  label="Show Hidden Selection"
-                 layout="topleft"
                  name="Show Hidden Selection">
                     <menu_item_check.on_check
                      control="RenderHiddenSelections" />
@@ -897,7 +698,6 @@
                 </menu_item_check>
                 <menu_item_check
                  label="Show Light Radius for Selection"
-                 layout="topleft"
                  name="Show Light Radius for Selection">
                     <menu_item_check.on_check
                      control="RenderLightRadius" />
@@ -906,7 +706,6 @@
                 </menu_item_check>
                 <menu_item_check
                  label="Show Selection Beam"
-                 layout="topleft"
                  name="Show Selection Beam">
                     <menu_item_check.on_check
                      control="ShowSelectionBeam" />
@@ -914,11 +713,9 @@
                      function="ToggleControl"
                      parameter="ShowSelectionBeam" />
                 </menu_item_check>
-        <menu_item_separator
-           layout="topleft" />
+        <menu_item_separator/>
                 <menu_item_check
                  label="Snap to Grid"
-                 layout="topleft"
                  name="Snap to Grid"
                  shortcut="G">
                     <menu_item_check.on_check
@@ -931,7 +728,6 @@
                 </menu_item_check>
                 <menu_item_call
                  label="Snap Object XY to Grid"
-                 layout="topleft"
                  name="Snap Object XY to Grid"
                  shortcut="shift|X">
                     <menu_item_call.on_click
@@ -941,7 +737,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Use Selection for Grid"
-                 layout="topleft"
                  name="Use Selection for Grid"
                  shortcut="shift|G">
                     <menu_item_call.on_click
@@ -951,7 +746,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Grid Options"
-                 layout="topleft"
                  name="Grid Options"
                  shortcut="control|shift|B">
                     <menu_item_call.on_click
@@ -964,12 +758,10 @@
         <menu
          create_jump_keys="true"
          label="Select Linked Parts"
-         layout="topleft"
          name="Select Linked Parts"
          tear_off="true">
             <menu_item_call
              label="Select Next Part"
-             layout="topleft"
              name="Select Next Part"
 	     shortcut="control|.">
                 <menu_item_call.on_click
@@ -980,7 +772,6 @@
             </menu_item_call>
             <menu_item_call
              label="Select Previous Part"
-             layout="topleft"
              name="Select Previous Part"
 	     shortcut="control|,">
                 <menu_item_call.on_click
@@ -991,7 +782,6 @@
             </menu_item_call>
             <menu_item_call
              label="Include Next Part"
-             layout="topleft"
              name="Include Next Part"
 	     shortcut="control|shift|.">
                 <menu_item_call.on_click
@@ -1002,7 +792,6 @@
             </menu_item_call>
             <menu_item_call
              label="Include Previous Part"
-             layout="topleft"
              name="Include Previous Part"
 	     shortcut="control|shift|,">
                 <menu_item_call.on_click
@@ -1015,48 +804,40 @@
     </menu>
     <menu
      label="Help"
-     layout="topleft"
      name="Help"
      tear_off="true">
         <menu_item_call
          label="[SECOND_LIFE] Help"
-         layout="topleft"
          name="Second Life Help"
          shortcut="F1">
             <menu_item_call.on_click
              function="ShowHelp"
              parameter="f1_help" />
         </menu_item_call>
-  <!--      <menu_item_call
+        <menu_item_call
          label="Tutorial"
-         layout="topleft"
          name="Tutorial">
             <menu_item_call.on_click
              function="Floater.Show"
              parameter="hud" />
         </menu_item_call>-->
-        <menu_item_separator
-             layout="topleft" />
+        <menu_item_separator/>
         <menu_item_call
              label="Report Abuse"
-             layout="topleft"
              name="Report Abuse">
                 <menu_item_call.on_click
                  function="ReportAbuse" />
             </menu_item_call>
         <menu_item_call
              label="Report Bug"
-             layout="topleft"
              name="Report Bug">
                 <menu_item_call.on_click
                  function="ShowHelp"
                  parameter="report_bug" />
             </menu_item_call>
-        <menu_item_separator
-             layout="topleft" />
+        <menu_item_separator/>
         <menu_item_call
          label="About [APP_NAME]"
-         layout="topleft"
          name="About Second Life">
             <menu_item_call.on_click
              function="Floater.Show"
@@ -1065,20 +846,28 @@
     </menu>
     <menu
      label="Advanced"
-     layout="topleft"
      name="Advanced"
      tear_off="true"
      visible="false">
+        <menu_item_check
+         label="Show Advanced Menu"
+         name="Show Advanced Menu"
+         shortcut="control|alt|D">
+          <on_check
+           function="CheckControl"
+           parameter="UseDebugMenus" />
+          <on_click
+           function="ToggleControl"
+           parameter="UseDebugMenus" />
+        </menu_item_check>
         <menu_item_call
          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 Textures"
-         layout="topleft"
          name="Rebake Texture"
          shortcut="control|alt|R">
             <menu_item_call.on_click
@@ -1086,7 +875,6 @@
         </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" />
@@ -1101,7 +889,6 @@
         <menu_item_separator/>
         <menu_item_check
          label="Limit Select Distance"
-         layout="topleft"
          name="Limit Select Distance">
             <menu_item_check.on_check
              function="CheckControl"
@@ -1112,7 +899,6 @@
         </menu_item_check>
         <menu_item_check
          label="Disable Camera Constraints"
-         layout="topleft"
          name="Disable Camera Distance">
             <menu_item_check.on_check
              function="CheckControl"
@@ -1121,11 +907,9 @@
              function="ToggleControl"
              parameter="DisableCameraConstraints" />
         </menu_item_check>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
         <menu_item_check
          label="High-res Snapshot"
-         layout="topleft"
          name="HighResSnapshot">
             <menu_item_check.on_check
              function="CheckControl"
@@ -1136,7 +920,6 @@
         </menu_item_check>
         <menu_item_check
          label="Quiet Snapshots to Disk"
-         layout="topleft"
          name="QuietSnapshotsToDisk">
             <menu_item_check.on_check
              function="CheckControl"
@@ -1147,7 +930,6 @@
         </menu_item_check>
         <menu_item_check
          label="Compress Snapshots to Disk"
-         layout="topleft"
          name="CompressSnapshotsToDisk">
             <menu_item_check.on_check
              function="CheckControl"
@@ -1156,17 +938,14 @@
              function="ToggleControl"
              parameter="CompressSnapshotsToDisk" />
         </menu_item_check>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
         <menu
          create_jump_keys="true"
          label="Performance Tools"
-         layout="topleft"
          name="Performance Tools"
          tear_off="true">
             <menu_item_call
              label="Lag Meter"
-             layout="topleft"
              name="Lag Meter">
                 <menu_item_call.on_click
                  function="Floater.Show"
@@ -1174,7 +953,6 @@
             </menu_item_call>
             <menu_item_check
              label="Statistics Bar"
-             layout="topleft"
              name="Statistics Bar"
              shortcut="control|shift|1">
                 <menu_item_check.on_check
@@ -1186,7 +964,6 @@
             </menu_item_check>
       <menu_item_check
         label="Show Avatar Rendering Cost"
-        layout="topleft"
         name="Avatar Rendering Cost">
            <menu_item_check.on_check
             function="Advanced.CheckInfoDisplay"
@@ -1199,12 +976,10 @@
         <menu
          create_jump_keys="true"
          label="Highlighting and Visibility"
-         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"
@@ -1215,7 +990,6 @@
                 </menu_item_check>
             <menu_item_check
              label="Hide Particles"
-             layout="topleft"
              name="Hide Particles"
              shortcut="control|alt|shift|=">
                 <menu_item_check.on_check
@@ -1227,7 +1001,6 @@
             </menu_item_check>
             <menu_item_check
              label="Hide Selected"
-             layout="topleft"
              name="Hide Selected">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -1238,7 +1011,6 @@
             </menu_item_check>
             <menu_item_check
              label="Highlight Transparent"
-             layout="topleft"
              name="Highlight Transparent"
              shortcut="control|alt|T">
                 <menu_item_check.on_check
@@ -1248,7 +1020,6 @@
             </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
@@ -1258,7 +1029,6 @@
             </menu_item_check>
             <menu_item_check
              label="Show Mouselook Crosshairs"
-             layout="topleft"
              name="ShowCrosshairs">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -1270,12 +1040,10 @@
   <!-- <menu
          create_jump_keys="true"
          label="Hover Tips"
-         layout="topleft"
          name="Hover Tips"
          tear_off="true">
             <menu_item_check
              label="Show Tips"
-             layout="topleft"
              name="Show Tips"
              shortcut="control|shift|T">
                 <menu_item_check.on_check
@@ -1283,11 +1051,9 @@
                 <menu_item_check.on_click
                  function="View.ShowHoverTips" />
             </menu_item_check>
-            <menu_item_separator
-             layout="topleft" />-->
+            <menu_item_separator/>
             <menu_item_check
              label="Show Land Tooltips"
-             layout="topleft"
              name="Land Tips">
                 <menu_item_check.on_check
                  control="ShowLandHoverTip" />
@@ -1297,9 +1063,8 @@
                 <menu_item_check.on_enable
                  function="View.CheckShowHoverTips" />
             </menu_item_check>
- <!--           <menu_item_check
+           <menu_item_check
              label="Show Tips On All Objects"
-             layout="topleft"
              name="Tips On All Objects">
                 <menu_item_check.on_check
                  control="ShowAllObjectHoverTip" />
@@ -1316,12 +1081,10 @@
         <menu
          create_jump_keys="true"
          label="Rendering Types"
-         layout="topleft"
          name="Rendering Types"
          tear_off="true">
             <menu_item_check
              label="Simple"
-             layout="topleft"
              name="Simple"
              shortcut="control|alt|shift|1">
                 <menu_item_check.on_check
@@ -1333,7 +1096,6 @@
             </menu_item_check>
             <menu_item_check
              label="Alpha"
-             layout="topleft"
              name="Alpha"
              shortcut="control|alt|shift|2">
                 <menu_item_check.on_check
@@ -1345,7 +1107,6 @@
             </menu_item_check>
             <menu_item_check
              label="Tree"
-             layout="topleft"
              name="Tree"
              shortcut="control|alt|shift|3">
                 <menu_item_check.on_check
@@ -1357,7 +1118,6 @@
             </menu_item_check>
             <menu_item_check
              label="Avatars"
-             layout="topleft"
              name="Character"
              shortcut="control|alt|shift|4">
                 <menu_item_check.on_check
@@ -1369,7 +1129,6 @@
             </menu_item_check>
             <menu_item_check
              label="SurfacePath"
-             layout="topleft"
              name="SurfacePath"
              shortcut="control|alt|shift|5">
                 <menu_item_check.on_check
@@ -1381,7 +1140,6 @@
             </menu_item_check>
             <menu_item_check
              label="Sky"
-             layout="topleft"
              name="Sky"
              shortcut="control|alt|shift|6">
                 <menu_item_check.on_check
@@ -1393,7 +1151,6 @@
             </menu_item_check>
             <menu_item_check
              label="Water"
-             layout="topleft"
              name="Water"
              shortcut="control|alt|shift|7">
                 <menu_item_check.on_check
@@ -1405,7 +1162,6 @@
             </menu_item_check>
             <menu_item_check
              label="Ground"
-             layout="topleft"
              name="Ground"
              shortcut="control|alt|shift|8">
                 <menu_item_check.on_check
@@ -1417,7 +1173,6 @@
             </menu_item_check>
             <menu_item_check
              label="Volume"
-             layout="topleft"
              name="Volume"
              shortcut="control|alt|shift|9">
                 <menu_item_check.on_check
@@ -1429,7 +1184,6 @@
             </menu_item_check>
             <menu_item_check
              label="Grass"
-             layout="topleft"
              name="Grass"
              shortcut="control|alt|shift|0">
                 <menu_item_check.on_check
@@ -1441,7 +1195,6 @@
             </menu_item_check>
             <menu_item_check
              label="Clouds"
-             layout="topleft"
              name="Clouds"
              shortcut="control|alt|shift|-">
                 <menu_item_check.on_check
@@ -1453,7 +1206,6 @@
             </menu_item_check>
             <menu_item_check
              label="Particles"
-             layout="topleft"
              name="Particles"
              shortcut="control|alt|shift|=">
                 <menu_item_check.on_check
@@ -1465,7 +1217,6 @@
             </menu_item_check>
             <menu_item_check
              label="Bump"
-             layout="topleft"
              name="Bump"
              shortcut="control|alt|shift|\">
                 <menu_item_check.on_check
@@ -1479,12 +1230,10 @@
         <menu
          create_jump_keys="true"
          label="Rendering Features"
-         layout="topleft"
          name="Rendering Features"
          tear_off="true">
             <menu_item_check
              label="UI"
-             layout="topleft"
              name="UI"
              shortcut="control|alt|F1">
                 <menu_item_check.on_check
@@ -1496,7 +1245,6 @@
             </menu_item_check>
             <menu_item_check
              label="Selected"
-             layout="topleft"
              name="Selected"
              shortcut="control|alt|F2">
                 <menu_item_check.on_check
@@ -1508,7 +1256,6 @@
             </menu_item_check>
             <menu_item_check
              label="Highlighted"
-             layout="topleft"
              name="Highlighted"
              shortcut="control|alt|F3">
                 <menu_item_check.on_check
@@ -1520,7 +1267,6 @@
             </menu_item_check>
             <menu_item_check
              label="Dynamic Textures"
-             layout="topleft"
              name="Dynamic Textures"
              shortcut="control|alt|F4">
                 <menu_item_check.on_check
@@ -1532,7 +1278,6 @@
             </menu_item_check>
             <menu_item_check
              label="Foot Shadows"
-             layout="topleft"
              name="Foot Shadows"
              shortcut="control|alt|F5">
                 <menu_item_check.on_check
@@ -1544,7 +1289,6 @@
             </menu_item_check>
             <menu_item_check
              label="Fog"
-             layout="topleft"
              name="Fog"
              shortcut="control|alt|F6">
                 <menu_item_check.on_check
@@ -1556,7 +1300,6 @@
             </menu_item_check>
             <menu_item_check
              label="Test FRInfo"
-             layout="topleft"
              name="Test FRInfo"
              shortcut="control|alt|F8">
                 <menu_item_check.on_check
@@ -1568,7 +1311,6 @@
             </menu_item_check>
             <menu_item_check
              label="Flexible Objects"
-             layout="topleft"
              name="Flexible Objects"
              shortcut="control|alt|F9">
                 <menu_item_check.on_check
@@ -1581,7 +1323,6 @@
         </menu>
         <menu_item_check
          label="Run Multiple Threads"
-         layout="topleft"
          name="Run Multiple Threads">
             <menu_item_check.on_check
              function="CheckControl"
@@ -1592,7 +1333,6 @@
         </menu_item_check>
         <menu_item_call
          label="Clear Group Cache"
-         layout="topleft"
          name="ClearGroupCache">
             <menu_item_call.on_click
              function="Advanced.ClearGroupCache"
@@ -1600,7 +1340,6 @@
         </menu_item_call>
         <menu_item_check
          label="Mouse Smoothing"
-         layout="topleft"
          name="Mouse Smoothing">
             <menu_item_check.on_check
              function="CheckControl"
@@ -1609,17 +1348,14 @@
              function="ToggleControl"
              parameter="MouseSmooth" />
         </menu_item_check>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
         <menu
          label="Shortcuts"
-         layout="topleft"
          name="Shortcuts"
          tear_off="true"
          visible="false">
           <menu_item_call
              label="Image (L$[COST])..."
-             layout="topleft"
              name="Upload Image"
              shortcut="control|U">
             <menu_item_call.on_click
@@ -1630,7 +1366,6 @@
             </menu_item_call>
             <menu_item_check
                label="Search"
-               layout="topleft"
                name="Search"
                shortcut="control|F">
             <menu_item_check.on_check
@@ -1643,7 +1378,6 @@
             <menu_item_call
              enabled="false"
              label="Release Keys"
-             layout="topleft"
              name="Release Keys">
                 <menu_item_call.on_click
                  function="Tools.ReleaseKeys"
@@ -1654,16 +1388,13 @@
             </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_separator/>
             <menu_item_check
              label="Always Run"
-             layout="topleft"
              name="Always Run"
              shortcut="control|R">
                 <menu_item_check.on_check
@@ -1673,7 +1404,6 @@
             </menu_item_check>
             <menu_item_check
              label="Fly"
-             layout="topleft"
              name="Fly"
              shortcut="Home">
                 <menu_item_check.on_check
@@ -1683,11 +1413,9 @@
                 <menu_item_check.on_enable
                  function="Agent.enableFlying" />
             </menu_item_check>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_call
              label="Close Window"
-             layout="topleft"
              name="Close Window"
              shortcut="control|W">
                 <menu_item_call.on_click
@@ -1697,7 +1425,6 @@
             </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
@@ -1705,22 +1432,18 @@
                 <menu_item_call.on_enable
                  function="File.EnableCloseAllWindows" />
             </menu_item_call>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <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_separator/>
             <menu_item_call
              label="Mouselook"
-             layout="topleft"
              name="Mouselook"
              shortcut="M">
                 <menu_item_call.on_click
@@ -1730,7 +1453,6 @@
             </menu_item_call>
             <menu_item_check
              label="Joystick Flycam"
-             layout="topleft"
              name="Joystick Flycam"
              shortcut="alt|shift|F">
                 <menu_item_check.on_check
@@ -1742,7 +1464,6 @@
             </menu_item_check>
             <menu_item_call
              label="Reset View"
-             layout="topleft"
              name="Reset View"
              shortcut="Esc">
                 <menu_item_call.on_click
@@ -1750,7 +1471,6 @@
             </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
@@ -1758,17 +1478,14 @@
                 <menu_item_call.on_enable
                  function="View.EnableLastChatter" />
             </menu_item_call>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu
              create_jump_keys="true"
              label="Select Build Tool"
-             layout="topleft"
              name="Select Tool"
              tear_off="true">
                 <menu_item_call
                  label="Focus Tool"
-                 layout="topleft"
                  name="Focus"
                  shortcut="control|1">
                     <menu_item_call.on_click
@@ -1777,7 +1494,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Move Tool"
-                 layout="topleft"
                  name="Move"
                  shortcut="control|2">
                     <menu_item_call.on_click
@@ -1786,7 +1502,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Edit Tool"
-                 layout="topleft"
                  name="Edit"
                  shortcut="control|3">
                     <menu_item_call.on_click
@@ -1795,7 +1510,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Create Tool"
-                 layout="topleft"
                  name="Create"
                  shortcut="control|4">
                     <menu_item_call.on_click
@@ -1804,7 +1518,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Land Tool"
-                 layout="topleft"
                  name="Land"
                  shortcut="control|5">
                     <menu_item_call.on_click
@@ -1812,11 +1525,9 @@
                      parameter="land" />
                 </menu_item_call>
             </menu>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_call
              label="Zoom In"
-             layout="topleft"
              name="Zoom In"
              shortcut="control|0">
                 <menu_item_call.on_click
@@ -1824,7 +1535,6 @@
             </menu_item_call>
             <menu_item_call
              label="Zoom Default"
-             layout="topleft"
              name="Zoom Default"
              shortcut="control|9">
                 <menu_item_call.on_click
@@ -1832,17 +1542,14 @@
             </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_separator/>
             <menu_item_call
              label="Toggle Fullscreen"
-             layout="topleft"
              name="Toggle Fullscreen"
              >
                <!-- Note: shortcut="alt|Enter" was deleted from the preceding node-->
@@ -1850,11 +1557,9 @@
                  function="View.Fullscreen" />
             </menu_item_call>
         </menu>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
         <menu_item_call
          label="Show Debug Settings"
-         layout="topleft"
          name="Debug Settings">
             <menu_item_call.on_click
              function="Advanced.ShowDebugSettings"
@@ -1862,7 +1567,6 @@
         </menu_item_call>
      <menu_item_check
          label="Show Develop Menu"
-         layout="topleft"
          name="Debug Mode"
          shortcut="control|alt|Q">
             <menu_item_check.on_check
@@ -1872,23 +1576,21 @@
              function="ToggleControl"
              parameter="QAMode" />
         </menu_item_check>
+    
     </menu>
     <menu
      create_jump_keys="true"
      label="Develop"
-     layout="topleft"
      name="Develop"
      tear_off="true"
      visible="false">
         <menu
          create_jump_keys="true"
          label="Consoles"
-         layout="topleft"
          name="Consoles"
          tear_off="true">
             <menu_item_check
              label="Texture Console"
-             layout="topleft"
              name="Texture Console"
              shortcut="control|shift|3"
              use_mac_ctrl="true">
@@ -1901,7 +1603,6 @@
             </menu_item_check>
             <menu_item_check
              label="Debug Console"
-             layout="topleft"
              name="Debug Console"
              shortcut="control|shift|4"
              use_mac_ctrl="true">
@@ -1914,7 +1615,6 @@
             </menu_item_check>
             <menu_item_call
              label="Notifications Console"
-             layout="topleft"
              name="Notifications"
              shortcut="control|shift|5">
               <menu_item_call.on_click
@@ -1923,7 +1623,6 @@
             </menu_item_call>
             <menu_item_check
                label="Texture Size Console"
-               layout="topleft"
                name="Texture Size"
                shortcut="control|shift|6">
               <menu_item_check.on_check
@@ -1935,7 +1634,6 @@
             </menu_item_check>
             <menu_item_check
                label="Texture Category Console"
-               layout="topleft"
                name="Texture Category"
                shortcut="control|shift|7">
               <menu_item_check.on_check
@@ -1947,7 +1645,6 @@
             </menu_item_check>
             <menu_item_check
              label="Fast Timers"
-             layout="topleft"
              name="Fast Timers"
              shortcut="control|shift|9"
              use_mac_ctrl="true">
@@ -1960,7 +1657,6 @@
             </menu_item_check>
             <menu_item_check
              label="Memory"
-             layout="topleft"
              name="Memory"
              shortcut="control|shift|0"
              use_mac_ctrl="true">
@@ -1971,11 +1667,9 @@
                  function="Advanced.ToggleConsole"
                  parameter="memory view" />
             </menu_item_check>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_call
              label="Region Info to Debug Console"
-             layout="topleft"
              name="Region Info to Debug Console">
                 <menu_item_call.on_click
                  function="Advanced.DumpInfoToConsole"
@@ -1983,7 +1677,6 @@
             </menu_item_call>
             <menu_item_call
              label="Group Info to Debug Console"
-             layout="topleft"
              name="Group Info to Debug Console">
                 <menu_item_call.on_click
                  function="Advanced.DumpInfoToConsole"
@@ -1991,17 +1684,14 @@
             </menu_item_call>
             <menu_item_call
              label="Capabilities Info to Debug Console"
-             layout="topleft"
              name="Capabilities Info to Debug Console">
                 <menu_item_call.on_click
                  function="Advanced.DumpInfoToConsole"
                  parameter="capabilities" />
             </menu_item_call>
-            <menu_item_separator
-         layout="topleft" />
+            <menu_item_separator/>
             <menu_item_check
              label="Camera"
-             layout="topleft"
              name="Camera">
                 <menu_item_check.on_check
                  function="Advanced.CheckHUDInfo"
@@ -2012,7 +1702,6 @@
             </menu_item_check>
             <menu_item_check
              label="Wind"
-             layout="topleft"
              name="Wind">
                 <menu_item_check.on_check
                  function="Advanced.CheckHUDInfo"
@@ -2023,7 +1712,6 @@
             </menu_item_check>
             <menu_item_check
              label="FOV"
-             layout="topleft"
              name="FOV">
                 <menu_item_check.on_check
                  function="Advanced.CheckHUDInfo"
@@ -2034,7 +1722,6 @@
             </menu_item_check>
             <menu_item_check
              label="Badge"
-             layout="topleft"
              name="Badge"
 			 shortcut="alt|control|shift|h">
                 <menu_item_check.on_check
@@ -2048,12 +1735,10 @@
         <menu
          create_jump_keys="true"
          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"
@@ -2064,7 +1749,6 @@
             </menu_item_check>
             <menu_item_check
              label="Show Render Info"
-             layout="topleft"
              name="Show Render Info">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2075,7 +1759,6 @@
             </menu_item_check>
             <menu_item_check
              label="Show Matrices"
-             layout="topleft"
              name="Show Matrices">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2086,7 +1769,6 @@
             </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"
@@ -2095,11 +1777,9 @@
                  function="ToggleControl"
                  parameter="DebugShowColor" />
             </menu_item_check>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_check
              label="Show Updates to Objects"
-             layout="topleft"
              name="Show Updates"
              shortcut="control|alt|shift|U">
                 <menu_item_check.on_check
@@ -2109,17 +1789,14 @@
                  function="Advanced.ToggleShowObjectUpdates" />
             </menu_item_check>
         </menu>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
         <menu
          create_jump_keys="true"
          label="Force an Error"
-         layout="topleft"
          name="Force Errors"
          tear_off="true">
             <menu_item_call
              label="Force Breakpoint"
-             layout="topleft"
              name="Force Breakpoint"
              shortcut="control|alt|shift|B">
                 <menu_item_call.on_click
@@ -2127,49 +1804,42 @@
             </menu_item_call>
             <menu_item_call
              label="Force LLError And Crash"
-             layout="topleft"
              name="Force LLError And Crash">
                 <menu_item_call.on_click
                  function="Advanced.ForceErrorLlerror" />
             </menu_item_call>
             <menu_item_call
              label="Force Bad Memory Access"
-             layout="topleft"
              name="Force Bad Memory Access">
                 <menu_item_call.on_click
                  function="Advanced.ForceErrorBadMemoryAccess" />
             </menu_item_call>
             <menu_item_call
              label="Force Infinite Loop"
-             layout="topleft"
              name="Force Infinite Loop">
                 <menu_item_call.on_click
                  function="Advanced.ForceErrorInfiniteLoop" />
             </menu_item_call>
             <menu_item_call
              label="Force Driver Crash"
-             layout="topleft"
              name="Force Driver Carsh">
                 <menu_item_call.on_click
                  function="Advanced.ForceErrorDriverCrash" />
             </menu_item_call>
             <menu_item_call
              label="Force Software Exception"
-             layout="topleft"
              name="Force Software Exception">
                 <menu_item_call.on_click
                  function="Advanced.ForceErrorSoftwareException" />
             </menu_item_call>
             <menu_item_call
              label="Force Disconnect Viewer"
-             layout="topleft"
              name="Force Disconnect Viewer">
                 <menu_item_call.on_click
                  function="Advanced.ForceErrorDisconnectViewer" />
             </menu_item_call>
             <menu_item_call
              label="Simulate a Memory Leak"
-             layout="topleft"
              name="Memory Leaking Simulation">
                <menu_item_call.on_click
                 function="Floater.Show"
@@ -2179,12 +1849,10 @@
         <menu
          create_jump_keys="true"
          label="Render Tests"
-         layout="topleft"
          name="Render Tests"
          tear_off="true">
             <menu_item_check
              label="Camera Offset"
-             layout="topleft"
              name="Camera Offset">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2195,7 +1863,6 @@
             </menu_item_check>
             <menu_item_check
              label="Randomize Framerate"
-             layout="topleft"
              name="Randomize Framerate">
                 <menu_item_check.on_check
                  function="Advanced.CheckRandomizeFramerate"
@@ -2205,7 +1872,6 @@
             </menu_item_check>
             <menu_item_check
              label="Periodic Slow Frame"
-             layout="topleft"
              name="Periodic Slow Frame">
                 <menu_item_check.on_check
                  function="Advanced.CheckPeriodicSlowFrame"
@@ -2216,7 +1882,6 @@
             </menu_item_check>
             <menu_item_check
              label="Frame Test"
-             layout="topleft"
              name="Frame Test">
                 <menu_item_check.on_check
                  function="Advanced.CheckFrameTest"
@@ -2228,12 +1893,10 @@
       <menu
         create_jump_keys="true"
         label="Render Metadata"
-        layout="topleft"
         name="Render Metadata"
         tear_off="true">
         <menu_item_check
          label="Bounding Boxes"
-         layout="topleft"
          name="Bounding Boxes">
         <menu_item_check.on_check
          function="Advanced.CheckInfoDisplay"
@@ -2244,7 +1907,6 @@
         </menu_item_check>
         <menu_item_check
          label="Octree"
-         layout="topleft"
          name="Octree">
           <menu_item_check.on_check
            function="Advanced.CheckInfoDisplay"
@@ -2255,7 +1917,6 @@
         </menu_item_check>
         <menu_item_check
          label="Shadow Frusta"
-         layout="topleft"
          name="Shadow Frusta">
           <menu_item_check.on_check
            function="Advanced.CheckInfoDisplay"
@@ -2266,7 +1927,6 @@
         </menu_item_check>
         <menu_item_check
          label="Occlusion"
-         layout="topleft"
          name="Occlusion">
           <menu_item_check.on_check
            function="Advanced.CheckInfoDisplay"
@@ -2277,7 +1937,6 @@
         </menu_item_check>
         <menu_item_check
          label="Render Batches"
-         layout="topleft"
          name="Render Batches">
           <menu_item_check.on_check
            function="Advanced.CheckInfoDisplay"
@@ -2288,7 +1947,6 @@
         </menu_item_check>
         <menu_item_check
          label="Texture Anim"
-         layout="topleft"
          name="Texture Anim">
           <menu_item_check.on_check
            function="Advanced.CheckInfoDisplay"
@@ -2299,7 +1957,6 @@
         </menu_item_check>
         <menu_item_check
          label="Texture Priority"
-         layout="topleft"
          name="Texture Priority">
           <menu_item_check.on_check
            function="Advanced.CheckInfoDisplay"
@@ -2310,7 +1967,6 @@
         </menu_item_check>
         <menu_item_check
          label="Texture Area"
-         layout="topleft"
          name="Texture Area">
           <menu_item_check.on_check
            function="Advanced.CheckInfoDisplay"
@@ -2321,7 +1977,6 @@
         </menu_item_check>
         <menu_item_check
          label="Face Area"
-         layout="topleft"
          name="Face Area">
           <menu_item_check.on_check
            function="Advanced.CheckInfoDisplay"
@@ -2332,7 +1987,6 @@
         </menu_item_check>
         <menu_item_check
          label="Lights"
-         layout="topleft"
          name="Lights">
           <menu_item_check.on_check
            function="Advanced.CheckInfoDisplay"
@@ -2343,7 +1997,6 @@
         </menu_item_check>
         <menu_item_check
          label="Collision Skeleton"
-         layout="topleft"
          name="Collision Skeleton">
           <menu_item_check.on_check
            function="Advanced.CheckInfoDisplay"
@@ -2354,7 +2007,6 @@
         </menu_item_check>
         <menu_item_check
          label="Raycast"
-         layout="topleft"
          name="Raycast">
           <menu_item_check.on_check
            function="Advanced.CheckInfoDisplay"
@@ -2367,7 +2019,6 @@
         <menu
          create_jump_keys="true"
          label="Rendering"
-         layout="topleft"
          name="Rendering"
          tear_off="true">
             <menu_item_check
@@ -2509,7 +2160,6 @@
             </menu_item_check>
             <menu_item_check
               label="Full Res Textures"
-             layout="topleft"
              name="Rull Res Textures">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2520,7 +2170,6 @@
             </menu_item_check>
             <menu_item_check
                label="Audit Textures"
-               layout="topleft"
                name="Audit Textures">
               <menu_item_check.on_check
                function="CheckControl"
@@ -2574,12 +2223,10 @@
         <menu
          create_jump_keys="true"
          label="Network"
-         layout="topleft"
          name="Network"
          tear_off="true">
             <menu_item_check
              label="Pause Agent"
-             layout="topleft"
              name="AgentPause">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2588,27 +2235,22 @@
                  function="ToggleControl"
                  parameter="AgentPause" />
             </menu_item_check>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_call
              label="Enable Message Log"
-             layout="topleft"
              name="Enable Message Log">
                 <menu_item_call.on_click
                  function="Advanced.EnableMessageLog" />
             </menu_item_call>
             <menu_item_call
              label="Disable Message Log"
-             layout="topleft"
              name="Disable Message Log">
                 <menu_item_call.on_click
                  function="Advanced.DisableMessageLog" />
             </menu_item_call>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_check
              label="Velocity Interpolate Objects"
-             layout="topleft"
              name="Velocity Interpolate Objects">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2619,7 +2261,6 @@
             </menu_item_check>
             <menu_item_check
              label="Ping Interpolate Object Positions"
-             layout="topleft"
              name="Ping Interpolate Object Positions">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2628,11 +2269,9 @@
                  function="ToggleControl"
                  parameter="PingInterpolate" />
             </menu_item_check>
-            <menu_item_separator
-             layout="topleft" />
+            <menu_item_separator/>
             <menu_item_call
              label="Drop a Packet"
-             layout="topleft"
              name="Drop a Packet"
              shortcut="control|alt|L">
                 <menu_item_call.on_click
@@ -2641,14 +2280,12 @@
         </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_call
              label="Bumps, Pushes &amp; Hits"
-             layout="topleft"
              name="Bumps, Pushes &amp;amp; Hits">
                 <menu_item_call.on_click
                  function="Floater.Show"
@@ -2658,12 +2295,10 @@
         <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"
@@ -2671,7 +2306,6 @@
             </menu_item_call>
             <menu_item_call
              label="Stop Playback"
-             layout="topleft"
              name="Stop Playback">
                 <menu_item_call.on_click
                  function="Advanced.AgentPilot"
@@ -2679,7 +2313,6 @@
             </menu_item_call>
             <menu_item_check
              label="Loop Playback"
-             layout="topleft"
              name="Loop Playback">
                 <menu_item_check.on_check
                  function="Advanced.CheckAgentPilotLoop"
@@ -2689,7 +2322,6 @@
             </menu_item_check>
             <menu_item_call
              label="Start Record"
-             layout="topleft"
              name="Start Record">
                 <menu_item_call.on_click
                  function="Advanced.AgentPilot"
@@ -2697,7 +2329,6 @@
             </menu_item_call>
             <menu_item_call
              label="Stop Record"
-             layout="topleft"
              name="Stop Record">
                 <menu_item_call.on_click
                  function="Advanced.AgentPilot"
@@ -2708,12 +2339,10 @@
         <menu
          create_jump_keys="true"
          label="World"
-         layout="topleft"
          name="World"
          tear_off="true">
             <menu_item_check
              label="Sim Sun Override"
-             layout="topleft"
              name="Sim Sun Override">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2724,7 +2353,6 @@
             </menu_item_check>
             <menu_item_check
              label="Cheesy Beacon"
-             layout="topleft"
              name="Cheesy Beacon">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2735,7 +2363,6 @@
             </menu_item_check>
             <menu_item_check
              label="Fixed Weather"
-             layout="topleft"
              name="Fixed Weather">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2746,7 +2373,6 @@
             </menu_item_check>
             <menu_item_call
              label="Dump Region Object Cache"
-             layout="topleft"
              name="Dump Region Object Cache">
                 <menu_item_call.on_click
                  function="Advanced.DumpRegionObjectCache" />
@@ -2755,12 +2381,10 @@
         <menu
          create_jump_keys="true"
          label="UI"
-         layout="topleft"
          name="UI"
          tear_off="true">
          <!--   <menu_item_check
              label="New Bottom Bar"
-             layout="topleft"
              name="New Bottom Bar">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2771,7 +2395,6 @@
             </menu_item_check>-->
             <menu_item_call
              label="Web Browser Test"
-             layout="topleft"
              name="Web Browser Test">
                 <menu_item_call.on_click
                  function="Advanced.WebBrowserTest"
@@ -2779,14 +2402,12 @@
             </menu_item_call>
             <menu_item_call
              label="Dump SelectMgr"
-             layout="topleft"
              name="Dump SelectMgr">
                 <menu_item_call.on_click
                  function="Advanced.DumpSelectMgr" />
             </menu_item_call>
             <menu_item_call
              label="Dump Inventory"
-             layout="topleft"
              name="Dump Inventory">
                 <menu_item_call.on_click
                  function="Advanced.DumpInventory" />
@@ -2799,14 +2420,12 @@
             </menu_item_call>
             <menu_item_call
              label="Dump Focus Holder"
-             layout="topleft"
              name="Dump Focus Holder">
                 <menu_item_call.on_click
                  function="Advanced.DumpFocusHolder" />
             </menu_item_call>
             <menu_item_call
              label="Print Selected Object Info"
-             layout="topleft"
              name="Print Selected Object Info"
              shortcut="control|shift|P">
                 <menu_item_call.on_click
@@ -2814,7 +2433,6 @@
             </menu_item_call>
             <menu_item_call
              label="Print Agent Info"
-             layout="topleft"
              name="Print Agent Info"
              shortcut="shift|P">
                 <menu_item_call.on_click
@@ -2822,7 +2440,6 @@
             </menu_item_call>
             <menu_item_call
              label="Memory Stats"
-             layout="topleft"
              name="Memory Stats"
              shortcut="control|alt|shift|M">
                 <menu_item_call.on_click
@@ -2830,7 +2447,6 @@
             </menu_item_call>
             <menu_item_check
              label="Double-ClickAuto-Pilot"
-             layout="topleft"
              name="Double-ClickAuto-Pilot">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2843,7 +2459,6 @@
             <menu_item_separator />
             <menu_item_check
              label="Debug SelectMgr"
-             layout="topleft"
              name="Debug SelectMgr">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -2854,7 +2469,6 @@
             </menu_item_check>
             <menu_item_check
              label="Debug Clicks"
-             layout="topleft"
              name="Debug Clicks">
                 <menu_item_check.on_check
                  function="Advanced.CheckDebugClicks"
@@ -2865,7 +2479,6 @@
             </menu_item_check>
             <menu_item_check
              label="Debug Views"
-             layout="topleft"
              name="Debug Views">
                 <menu_item_check.on_check
                  function="Advanced.CheckDebugViews" />
@@ -2874,7 +2487,6 @@
             </menu_item_check>
             <menu_item_check
              label="Debug Name Tooltips"
-             layout="topleft"
              name="Debug Name Tooltips">
                 <menu_item_check.on_check
                  function="Advanced.CheckXUINameTooltips"
@@ -2884,7 +2496,6 @@
             </menu_item_check>
             <menu_item_check
              label="Debug Mouse Events"
-             layout="topleft"
              name="Debug Mouse Events">
                 <menu_item_check.on_check
                  function="Advanced.CheckDebugMouseEvents"
@@ -2894,7 +2505,6 @@
             </menu_item_check>
             <menu_item_check
              label="Debug Keys"
-             layout="topleft"
              name="Debug Keys">
                 <menu_item_check.on_check
                  function="Advanced.CheckDebugKeys"
@@ -2904,7 +2514,6 @@
             </menu_item_check>
             <menu_item_check
              label="Debug WindowProc"
-             layout="topleft"
              name="Debug WindowProc">
                 <menu_item_check.on_check
                  function="Advanced.CheckDebugWindowProc"
@@ -2921,14 +2530,12 @@
          tear_off="true">
             <menu_item_call
                label="Reload Color Settings"
-               layout="topleft"
                name="Reload Color Settings">
               <menu_item_call.on_click
                function="Advanced.ReloadColorSettings" />
             </menu_item_call>
             <menu_item_call
              label="Show Font Test"
-             layout="topleft"
              name="Show Font Test">
                 <menu_item_call.on_click
                  function="Floater.Show"
@@ -2936,21 +2543,18 @@
             </menu_item_call>
             <menu_item_call
              label="Load from XML"
-             layout="topleft"
              name="Load from XML">
                 <menu_item_call.on_click
                  function="Advanced.LoadUIFromXML" />
             </menu_item_call>
             <menu_item_call
              label="Save to XML"
-             layout="topleft"
              name="Save to XML">
                 <menu_item_call.on_click
                  function="Advanced.SaveUIToXML" />
             </menu_item_call>
             <menu_item_check
              label="Show XUI Names"
-             layout="topleft"
              name="Show XUI Names">
                 <menu_item_check.on_check
                  function="Advanced.CheckXUINames"
@@ -2960,7 +2564,6 @@
             </menu_item_check>
           <menu_item_call
            label="Send Test IMs"
-           layout="topleft"
            name="Send Test IMs">
             <menu_item_call.on_click
              function="Advanced.SendTestIMs" />
@@ -2969,18 +2572,15 @@
         <menu
          create_jump_keys="true"
          label="Avatar"
-         layout="topleft"
          name="Character"
          tear_off="true">
             <menu
              create_jump_keys="true"
              label="Grab Baked Texture"
-             layout="topleft"
              name="Grab Baked Texture"
              tear_off="true">
                 <menu_item_call
                  label="Iris"
-                 layout="topleft"
                  name="Iris">
                     <menu_item_call.on_click
                      function="Advanced.GrabBakedTexture"
@@ -2991,7 +2591,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Head"
-                 layout="topleft"
                  name="Head">
                     <menu_item_call.on_click
                      function="Advanced.GrabBakedTexture"
@@ -3002,7 +2601,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Upper Body"
-                 layout="topleft"
                  name="Upper Body">
                     <menu_item_call.on_click
                      function="Advanced.GrabBakedTexture"
@@ -3013,7 +2611,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Lower Body"
-                 layout="topleft"
                  name="Lower Body">
                     <menu_item_call.on_click
                      function="Advanced.GrabBakedTexture"
@@ -3024,7 +2621,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Skirt"
-                 layout="topleft"
                  name="Skirt">
                     <menu_item_call.on_click
                      function="Advanced.GrabBakedTexture"
@@ -3037,19 +2633,16 @@
             <menu
              create_jump_keys="true"
              label="Character Tests"
-             layout="topleft"
              name="Character Tests"
              tear_off="true">
                 <menu_item_call
                  label="Appearance To XML"
-                 layout="topleft"
                  name="Appearance To XML">
                     <menu_item_call.on_click
                      function="Advanced.AppearanceToXML" />
                 </menu_item_call>
                 <menu_item_call
                  label="Toggle Character Geometry"
-                 layout="topleft"
                  name="Toggle Character Geometry">
                     <menu_item_call.on_click
                      function="Advanced.ToggleCharacterGeometry" />
@@ -3058,28 +2651,24 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Test Male"
-                 layout="topleft"
                  name="Test Male">
                     <menu_item_call.on_click
                      function="Advanced.TestMale" />
                 </menu_item_call>
                 <menu_item_call
                  label="Test Female"
-                 layout="topleft"
                  name="Test Female">
                     <menu_item_call.on_click
                      function="Advanced.TestFemale" />
                 </menu_item_call>
                 <menu_item_call
                  label="Toggle PG"
-                 layout="topleft"
                  name="Toggle PG">
                     <menu_item_call.on_click
                      function="Advanced.TogglePG" />
                 </menu_item_call>
                 <menu_item_check
                  label="Allow Select Avatar"
-                 layout="topleft"
                  name="Allow Select Avatar">
                     <menu_item_check.on_check
                      function="CheckControl"
@@ -3091,14 +2680,12 @@
             </menu>
             <menu_item_call
              label="Force Params to Default"
-             layout="topleft"
              name="Force Params to Default">
                 <menu_item_call.on_click
                  function="Advanced.ForceParamsToDefault" />
             </menu_item_call>
             <menu_item_check
              label="Animation Info"
-             layout="topleft"
              name="Animation Info">
                 <menu_item_check.on_check
                  function="Advanced.CheckAnimationInfo"
@@ -3109,7 +2696,6 @@
             </menu_item_check>
             <menu_item_check
              label="Slow Motion Animations"
-             layout="topleft"
              name="Slow Motion Animations">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -3120,7 +2706,6 @@
             </menu_item_check>
             <menu_item_check
              label="Show Look At"
-             layout="topleft"
              name="Show Look At">
                 <menu_item_check.on_check
                  function="Advanced.CheckShowLookAt"
@@ -3130,7 +2715,6 @@
             </menu_item_check>
             <menu_item_check
              label="Show Point At"
-             layout="topleft"
              name="Show Point At">
                 <menu_item_check.on_check
                  function="Advanced.CheckShowPointAt"
@@ -3140,7 +2724,6 @@
             </menu_item_check>
             <menu_item_check
              label="Debug Joint Updates"
-             layout="topleft"
              name="Debug Joint Updates">
                 <menu_item_check.on_check
                  function="Advanced.CheckDebugJointUpdates"
@@ -3150,7 +2733,6 @@
             </menu_item_check>
             <menu_item_check
              label="Disable LOD"
-             layout="topleft"
              name="Disable LOD">
                 <menu_item_check.on_check
                  function="Advanced.CheckDisableLOD"
@@ -3160,7 +2742,6 @@
             </menu_item_check>
             <menu_item_check
              label="Debug Character Vis"
-             layout="topleft"
              name="Debug Character Vis">
                 <menu_item_check.on_check
                  function="Advanced.CheckDebugCharacterVis"
@@ -3170,7 +2751,6 @@
             </menu_item_check>
             <menu_item_check
              label="Show Collision Skeleton"
-             layout="topleft"
              name="Show Collision Skeleton">
                 <menu_item_check.on_check
                  function="Advanced.CheckInfoDisplay"
@@ -3181,7 +2761,6 @@
             </menu_item_check>
             <menu_item_check
              label="Display Agent Target"
-             layout="topleft"
              name="Display Agent Target">
                 <menu_item_check.on_check
                  function="Advanced.CheckInfoDisplay"
@@ -3193,7 +2772,6 @@
 <!-- Appears not to exist anymore
             <menu_item_check
              label="Debug Rotation"
-             layout="topleft"
              name="Debug Rotation">
                 <menu_item_check.on_check
                  function="CheckControl"
@@ -3205,14 +2783,12 @@
 -->
             <menu_item_call
              label="Dump Attachments"
-             layout="topleft"
              name="Dump Attachments">
                 <menu_item_call.on_click
                  function="Advanced.DumpAttachments" />
             </menu_item_call>
             <menu_item_call
              label="Debug Avatar Textures"
-             layout="topleft"
              name="Debug Avatar Textures"
              shortcut="control|alt|shift|A">
                 <menu_item_call.on_click
@@ -3220,18 +2796,15 @@
             </menu_item_call>
             <menu_item_call
              label="Dump Local Textures"
-             layout="topleft"
              name="Dump Local Textures"
              shortcut="alt|shift|M">
                 <menu_item_call.on_click
                  function="Advanced.DumpAvatarLocalTextures" />
             </menu_item_call>
         </menu>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
         <menu_item_check
          label="HTTP Textures"
-         layout="topleft"
          name="HTTP Textures">
             <menu_item_check.on_check
              function="CheckControl"
@@ -3242,14 +2815,12 @@
         </menu_item_check>
         <menu_item_call
          label="Compress Images"
-         layout="topleft"
          name="Compress Images">
             <menu_item_call.on_click
              function="Advanced.CompressImage" />
         </menu_item_call>
         <menu_item_check
          label="Output Debug Minidump"
-         layout="topleft"
          name="Output Debug Minidump">
             <menu_item_check.on_check
              function="CheckControl"
@@ -3260,7 +2831,6 @@
         </menu_item_check>
         <menu_item_check
          label="Console Window on next Run"
-         layout="topleft"
          name="Console Window">
             <menu_item_check.on_check
              function="CheckControl"
@@ -3269,11 +2839,9 @@
              function="ToggleControl"
              parameter="ShowConsoleWindow" />
         </menu_item_check>
-        <menu_item_separator
-         layout="topleft" />
+        <menu_item_separator/>
         <menu_item_check
          label="Show Admin Menu"
-         layout="topleft"
          name="View Admin Options">
             <menu_item_check.on_check
              function="Advanced.CheckViewAdminOptions"
@@ -3283,7 +2851,6 @@
         </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
@@ -3291,7 +2858,6 @@
         </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
@@ -3301,18 +2867,15 @@
     <menu
      create_jump_keys="true"
      label="Admin"
-     layout="topleft"
      name="Admin"
      tear_off="true"
      visible="false">
         <menu
          create_jump_keys="true"
          label="Object"
-         layout="topleft"
          tear_off="true">
             <menu_item_call
              label="Take Copy"
-             layout="topleft"
              name="Take Copy"
              shortcut="control|alt|shift|O">
                 <menu_item_call.on_click
@@ -3322,7 +2885,6 @@
             </menu_item_call>
             <menu_item_call
              label="Force Owner To Me"
-             layout="topleft"
              name="Force Owner To Me">
                 <menu_item_call.on_click
                  function="Admin.HandleObjectOwnerSelf" />
@@ -3331,7 +2893,6 @@
             </menu_item_call>
             <menu_item_call
              label="Force Owner Permissive"
-             layout="topleft"
              name="Force Owner Permissive">
                 <menu_item_call.on_click
                  function="Admin.HandleObjectOwnerPermissive" />
@@ -3340,7 +2901,6 @@
             </menu_item_call>
             <menu_item_call
              label="Delete"
-             layout="topleft"
              name="Delete"
              shortcut="control|alt|shift|Del">
                 <menu_item_call.on_click
@@ -3350,7 +2910,6 @@
             </menu_item_call>
             <menu_item_call
              label="Lock"
-             layout="topleft"
              name="Lock"
              shortcut="control|alt|shift|L">
                 <menu_item_call.on_click
@@ -3360,7 +2919,6 @@
             </menu_item_call>
             <menu_item_call
              label="Get Assets IDs"
-             layout="topleft"
              name="Get Assets IDs"
              shortcut="control|alt|shift|I">
                 <menu_item_call.on_click
@@ -3372,12 +2930,10 @@
         <menu
          create_jump_keys="true"
          label="Parcel"
-         layout="topleft"
          name="Parcel"
          tear_off="true">
             <menu_item_call
              label="Force Owner To Me"
-             layout="topleft"
              name="Owner To Me">
                 <menu_item_call.on_click
                  function="Admin.HandleForceParcelOwnerToMe" />
@@ -3386,7 +2942,6 @@
             </menu_item_call>
             <menu_item_call
              label="Set to Linden Content"
-             layout="topleft"
              name="Set to Linden Content"
              shortcut="control|alt|shift|C">
                 <menu_item_call.on_click
@@ -3396,7 +2951,6 @@
             </menu_item_call>
             <menu_item_call
              label="Claim Public Land"
-             layout="topleft"
              name="Claim Public Land">
                 <menu_item_call.on_click
                  function="Admin.HandleClaimPublicLand" />
@@ -3407,12 +2961,10 @@
         <menu
          create_jump_keys="true"
          label="Region"
-         layout="topleft"
          name="Region"
          tear_off="true">
             <menu_item_call
              label="Dump Temp Asset Data"
-             layout="topleft"
              name="Dump Temp Asset Data">
                 <menu_item_call.on_click
                  function="Admin.HandleRegionDumpTempAssetData" />
@@ -3421,7 +2973,6 @@
             </menu_item_call>
             <menu_item_call
              label="Save Region State"
-             layout="topleft"
              name="Save Region State">
                 <menu_item_call.on_click
                  function="Admin.OnSaveState" />
@@ -3431,7 +2982,6 @@
         </menu>
         <menu_item_call
          label="God Tools"
-         layout="topleft"
          name="God Tools">
             <menu_item_call.on_click
              function="Floater.Show"
@@ -3443,34 +2993,29 @@
     <menu
      create_jump_keys="true"
      label="Admin"
-     layout="topleft"
      name="Deprecated"
      tear_off="true"
      visible="false">
         <menu
          create_jump_keys="true"
          label="Attach Object"
-         layout="topleft"
          mouse_opaque="false"
          name="Attach Object"
          tear_off="true" />
         <menu
          create_jump_keys="true"
          label="Detach Object"
-         layout="topleft"
          mouse_opaque="false"
          name="Detach Object"
          tear_off="true" />
         <menu
          create_jump_keys="true"
          label="Take Off Clothing"
-         layout="topleft"
          mouse_opaque="false"
          name="Take Off Clothing"
          tear_off="true">
             <menu_item_call
              label="Shirt"
-             layout="topleft"
              name="Shirt">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3481,7 +3026,6 @@
             </menu_item_call>
             <menu_item_call
              label="Pants"
-             layout="topleft"
              name="Pants">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3492,7 +3036,6 @@
             </menu_item_call>
             <menu_item_call
              label="Shoes"
-             layout="topleft"
              name="Shoes">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3503,7 +3046,6 @@
             </menu_item_call>
             <menu_item_call
              label="Socks"
-             layout="topleft"
              name="Socks">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3514,7 +3056,6 @@
             </menu_item_call>
             <menu_item_call
              label="Jacket"
-             layout="topleft"
              name="Jacket">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3525,7 +3066,6 @@
             </menu_item_call>
             <menu_item_call
              label="Gloves"
-             layout="topleft"
              name="Gloves">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3536,7 +3076,6 @@
             </menu_item_call>
             <menu_item_call
              label="Undershirt"
-             layout="topleft"
              name="Menu Undershirt">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3547,7 +3086,6 @@
             </menu_item_call>
             <menu_item_call
              label="Underpants"
-             layout="topleft"
              name="Menu Underpants">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3558,7 +3096,6 @@
             </menu_item_call>
             <menu_item_call
              label="Skirt"
-             layout="topleft"
              name="Skirt">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3569,7 +3106,6 @@
             </menu_item_call>
             <menu_item_call
              label="Alpha"
-             layout="topleft"
              name="Alpha">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3580,7 +3116,6 @@
             </menu_item_call>
             <menu_item_call
              label="Tattoo"
-             layout="topleft"
              name="Tattoo">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3591,7 +3126,6 @@
             </menu_item_call>
             <menu_item_call
              label="All Clothes"
-             layout="topleft"
              name="All Clothes">
                 <menu_item_call.on_click
                  function="Edit.TakeOff"
@@ -3601,12 +3135,10 @@
         <menu
          create_jump_keys="true"
          label="Help"
-         layout="topleft"
          name="Help"
          tear_off="true">
             <menu_item_call
              label="Official Linden Blog"
-             layout="topleft"
              name="Official Linden Blog">
                 <menu_item_call.on_click
                  function="PromptShowURL"
@@ -3615,7 +3147,6 @@
             </menu_item_call>
             <menu_item_call
              label="Scripting Portal"
-             layout="topleft"
              name="Scripting Portal">
                 <menu_item_call.on_click
                  function="PromptShowURL"
@@ -3625,12 +3156,10 @@
             <menu
              create_jump_keys="true"
              label="Bug Reporting"
-             layout="topleft"
              name="Bug Reporting"
              tear_off="true">
                 <menu_item_call
                  label="Public Issue Tracker"
-                 layout="topleft"
                  name="Public Issue Tracker">
                     <menu_item_call.on_click
                      function="PromptShowURL"
@@ -3639,18 +3168,15 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Public Issue Tracker Help"
-                 layout="topleft"
                  name="Publc Issue Tracker Help">
                     <menu_item_call.on_click
                      function="PromptShowURL"
                      name="PublicIssueTrackerHelp_url"
                      parameter="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
                 </menu_item_call>
-                <menu_item_separator
-                 layout="topleft" />
+                <menu_item_separator/>
                 <menu_item_call
                  label="Bug Reporting 101"
-                 layout="topleft"
                  name="Bug Reporing 101">
                     <menu_item_call.on_click
                      function="PromptShowURL"
@@ -3659,7 +3185,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="Security Issues"
-                 layout="topleft"
                  name="Security Issues">
                     <menu_item_call.on_click
                      function="PromptShowURL"
@@ -3668,7 +3193,6 @@
                 </menu_item_call>
                 <menu_item_call
                  label="QA Wiki"
-                 layout="topleft"
                  name="QA Wiki">
                     <menu_item_call.on_click
                      function="PromptShowURL"
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index cc68ec2bdc5..01adc00e1a1 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -64,7 +64,6 @@ First name:
 </text>
 <line_editor
 follows="left|bottom"
-handle_edit_keys_directly="true"
 height="22"
 label="First"
 left_delta="0"
@@ -85,7 +84,6 @@ top_pad="0"
     Last name:   </text>
 <line_editor
 follows="left|bottom"
-handle_edit_keys_directly="true"
 height="22"
 label="Last"
 max_length="31"
@@ -106,7 +104,6 @@ top="20"
 </text>
 <line_editor
 follows="left|bottom"
-handle_edit_keys_directly="true"
   height="22"
   max_length="16"
 name="password_edit"
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index 9e5ef10d42d..2efcfa57725 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -742,7 +742,6 @@
                          bg_focus_color="DkGray2"
                          bg_readonly_color="DkGray2"
                          follows="left|top|right"
-                         handle_edit_keys_directly="true"
                          height="90"
                          layout="topleft"
                          left="10"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 2123e62daa0..d75aba44e5d 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -210,7 +210,6 @@
    enabled="false"
    follows="left|top"
    font="SansSerif"
-   handle_edit_keys_directly="true"
    height="23"
    layout="topleft"
    left="80"
diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
index dc8f71c868a..2b2ea78fac4 100644
--- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
@@ -113,7 +113,6 @@
      max_length="65535"
      name="covenant_editor"
      top_delta="30"
-     handle_edit_keys_directly="true"
      width="340"
      word_wrap="true">
         There is no Covenant provided for this Estate.
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index d4444205503..c5c66c04d50 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -143,7 +143,6 @@
      name="Script Editor"
      width="487"
      show_line_numbers="true" 
-     handle_edit_keys_directly="true" 
      word_wrap="true">
         Loading...
     </text_editor>
diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
index a21e3f26450..a054960bf8c 100644
--- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
@@ -3,7 +3,6 @@
              background_image_disabled="TextField_Disabled"
              background_image_focused="TextField_Active"
              select_on_focus="false"
-             handle_edit_keys_directly="false"
              commit_on_focus_lost="true"
              ignore_tab="true"
              cursor_color="TextCursorColor"
-- 
GitLab