--- linden/indra/newview/skins/xui/en-us/menu_viewer.xml
+++ linden/indra/newview/skins/xui/en-us/menu_viewer.xml
@@ -701,11 +701,956 @@
 		<menu_item_call name="Release Notes..." label="Release Notes...">
 			<on_click function="PromptShowFile" userdata="WebLaunchReleaseNotes,releasenotes.txt" />
 		</menu_item_call>
 		<menu_item_separator />
 		<menu_item_call name="About Second Life..." label="About Second Life...">
 			<on_click function="ShowFloater" userdata="about" />
 		</menu_item_call>
 	</menu>
 
 
+
+
+
+  <!-- ADVANCED -->
+
+  <menu name="Advanced" drop_shadow="true" opaque="true" tear_off="true">
+
+
+
+    <!-- CONSOLES -->
+
+    <menu name="Consoles" drop_shadow="true" opaque="true" tear_off="true">
+      <menu_item_check name="Frame Console" label="Frame Console"
+                       shortcut="control|shift|2">
+        <on_click function="Advanced.ToggleConsole" userdata="frame" />
+        <on_check function="Advanced.CheckConsole" userdata="frame" />
+      </menu_item_check>
+      <menu_item_check name="Texture Console" label="Texture Console"
+                       shortcut="control|shift|3">
+        <on_click function="Advanced.ToggleConsole" userdata="texture" />
+        <on_check function="Advanced.CheckConsole" userdata="texture" />
+      </menu_item_check>
+      <menu_item_check name="Debug Console" label="Debug Console"
+                       shortcut="control|shift|4">
+        <on_click function="Advanced.ToggleConsole" userdata="debug" />
+        <on_check function="Advanced.CheckConsole" userdata="debug" />
+      </menu_item_check>
+      <menu_item_check name="Fast Timers" label="Fast Timers"
+                       shortcut="control|shift|9">
+        <on_click function="Advanced.ToggleConsole" userdata="fast timers" />
+        <on_check function="Advanced.CheckConsole" userdata="fast timers" />
+      </menu_item_check>
+      <!-- Requires compiled-in support, I think?
+      <menu_item_check name="Memory" label="Memory"
+                       shortcut="control|shift|0">
+        <on_click function="Advanced.ToggleConsole" userdata="memory" />
+        <on_check function="Advanced.CheckConsole" userdata="memory" />
+      </menu_item_check>
+      -->
+      <menu_item_separator />
+      <menu_item_call name="Region Info to Debug Console"
+                      label="Region Info to Debug Console">
+        <on_click function="Advanced.DumpInfoToConsole" userdata="region" />
+      </menu_item_call>
+      <menu_item_call name="Group Info to Debug Console"
+                      label="Group Info to Debug Console">
+        <on_click function="Advanced.DumpInfoToConsole" userdata="group" />
+      </menu_item_call>
+      <menu_item_call name="Capabilities Info to Debug Console"
+                      label="Capabilities Info to Debug Console">
+        <on_click function="Advanced.DumpInfoToConsole" 
+                  userdata="capabilities" />
+      </menu_item_call>
+    </menu>
+
+
+    <menu_item_call name="Reload personal setting overrides"
+                    label="Reload personal settings overrides"
+                    shortcut="control|shift|F2">
+      <on_click function="Advanced.ReloadSettingsOverrides" userdata="" />
+    </menu_item_call>
+
+
+
+    <!-- HUD INFO -->
+
+    <menu name="HUD Info" drop_shadow="true" opaque="true" tear_off="true">
+      <menu_item_check name="Velocity" label="Velocity">
+        <on_click function="Advanced.ToggleHUDInfo" userdata="velocity" />
+        <on_check function="Advanced.CheckHUDInfo" userdata="velocity" />
+      </menu_item_check>
+      <menu_item_check name="Camera" label="Camera">
+        <on_click function="Advanced.ToggleHUDInfo" userdata="camera" />
+        <on_check function="Advanced.CheckHUDInfo" userdata="camera" />
+      </menu_item_check>
+      <menu_item_check name="Wind" label="Wind">
+        <on_click function="Advanced.ToggleHUDInfo" userdata="wind" />
+        <on_check function="Advanced.CheckHUDInfo" userdata="wind" />
+      </menu_item_check>
+      <menu_item_check name="FOV" label="FOV">
+        <on_click function="Advanced.ToggleHUDInfo" userdata="fov" />
+        <on_check function="Advanced.CheckHUDInfo" userdata="fov" />
+      </menu_item_check>
+    </menu>
+
+
+    <menu_item_separator />
+
+    <menu_item_check name="High-res Snapshot" label="High-res Snapshot">
+      <on_click function="ToggleControl" userdata="HighResSnapshot" />
+      <on_check control="HighResSnapshot" />
+    </menu_item_check>
+    <menu_item_check name="Quiet Snapshots to Disk"
+                     label="Quiet Snapshots to Disk">
+      <on_click function="ToggleControl" userdata="QuietSnapshotsToDisk" />
+      <on_check control="QuietSnapshotsToDisk" />
+    </menu_item_check>
+    <menu_item_check name="Compress Snapshots to Disk"
+                     label="Compress Snapshots to Disk">
+      <on_click function="ToggleControl" userdata="CompressSnapshotsToDisk" />
+      <on_check control="CompressSnapshotsToDisk" />
+    </menu_item_check>
+    <menu_item_check name="Show Mouselook Crosshairs"
+                     label="Show Mouselook Crosshairs">
+      <on_click function="ToggleControl" userdata="ShowCrosshairs" />
+      <on_check control="ShowCrosshairs" />
+    </menu_item_check>
+    <menu_item_check name="Debug Permissions" label="Debug Permissions">
+      <on_click function="ToggleControl" userdata="DebugPermissions" />
+      <on_check control="DebugPermissions" />
+    </menu_item_check>
+    <menu_item_call name="Clear Group Cache" label="Clear Group Cache">
+      <on_click function="Advanced.ClearGroupCache" userdata="" />
+    </menu_item_call>
+    <menu_item_separator />
+
+
+
+    <!-- RENDERING -->
+
+    <menu name="Rendering" drop_shadow="true" opaque="true" tear_off="true">
+
+      <!-- TYPES -->
+      <menu name="Types" drop_shadow="true" opaque="true" tear_off="true">
+        <menu_item_check name="Simple" label="Simple"
+                         shortcut="control|alt|shift|1">
+          <on_click function="Advanced.ToggleRenderType" userdata="simple" />
+          <on_check function="Advanced.CheckRenderType" userdata="simple" />
+        </menu_item_check>
+        <menu_item_check name="Alpha" label="Alpha"
+                         shortcut="control|alt|shift|2">
+          <on_click function="Advanced.ToggleRenderType" userdata="alpha" />
+          <on_check function="Advanced.CheckRenderType" userdata="alpha" />
+        </menu_item_check>
+        <menu_item_check name="Tree" label="Tree"
+                         shortcut="control|alt|shift|3">
+          <on_click function="Advanced.ToggleRenderType" userdata="tree" />
+          <on_check function="Advanced.CheckRenderType" userdata="tree" />
+        </menu_item_check>
+        <menu_item_check name="Character" label="Character"
+                         shortcut="control|alt|shift|4">
+          <on_click function="Advanced.ToggleRenderType" userdata="avatar" />
+          <on_check function="Advanced.CheckRenderType" userdata="avatar" />
+        </menu_item_check>
+        <menu_item_check name="SurfacePatch" label="SurfacePatch"
+                         shortcut="control|alt|shift|5">
+          <on_click function="Advanced.ToggleRenderType" userdata="terrain" />
+          <on_check function="Advanced.CheckRenderType" userdata="terrain" />
+        </menu_item_check>
+        <menu_item_check name="Sky" label="Sky"
+                         shortcut="control|alt|shift|6">
+          <on_click function="Advanced.ToggleRenderType" userdata="sky" />
+          <on_check function="Advanced.CheckRenderType" userdata="sky" />
+        </menu_item_check>
+        <menu_item_check name="Water" label="Water"
+                         shortcut="control|alt|shift|7">
+          <on_click function="Advanced.ToggleRenderType" userdata="water" />
+          <on_check function="Advanced.CheckRenderType" userdata="water" />
+        </menu_item_check>
+        <menu_item_check name="Ground" label="Ground"
+                         shortcut="control|alt|shift|8">
+          <on_click function="Advanced.ToggleRenderType" userdata="ground" />
+          <on_check function="Advanced.CheckRenderType" userdata="ground" />
+        </menu_item_check>
+        <menu_item_check name="Volume" label="Volume"
+                         shortcut="control|alt|shift|9">
+          <on_click function="Advanced.ToggleRenderType" userdata="volume" />
+          <on_check function="Advanced.CheckRenderType" userdata="volume" />
+        </menu_item_check>
+        <menu_item_check name="Grass" label="Grass"
+                         shortcut="control|alt|shift|0">
+          <on_click function="Advanced.ToggleRenderType" userdata="grass" />
+          <on_check function="Advanced.CheckRenderType" userdata="grass" />
+        </menu_item_check>
+        <menu_item_check name="Clouds" label="Clouds"
+                         shortcut="control|alt|shift|-">
+          <on_click function="Advanced.ToggleRenderType" userdata="clouds" />
+          <on_check function="Advanced.CheckRenderType" userdata="clouds" />
+        </menu_item_check>
+        <menu_item_check name="Particles" label="Particles"
+                         shortcut="control|alt|shift|=">
+          <on_click function="Advanced.ToggleRenderType" 
+                    userdata="particles" />
+          <on_check function="Advanced.CheckRenderType" 
+                    userdata="particles" />
+        </menu_item_check>
+        <menu_item_check name="Bump" label="Bump"
+                         shortcut="control|alt|shift|\">
+          <on_click function="Advanced.ToggleRenderType" userdata="bump" />
+          <on_check function="Advanced.CheckRenderType" userdata="bump" />
+        </menu_item_check>
+      </menu>
+
+
+      <!-- FEATURES -->
+      <menu drop_shadow="true" name="Features" opaque="true" tear_off="true">
+        <menu_item_check name="UI" label="UI" shortcut="control|alt|F1">
+          <on_click function="Advanced.ToggleFeature" userdata="ui" />
+          <on_check function="Advanced.CheckFeature" userdata="ui" />
+        </menu_item_check>
+        <menu_item_check name="Selected" label="Selected"
+                         shortcut="control|alt|F2">
+          <on_click function="Advanced.ToggleFeature" userdata="selected" />
+          <on_check function="Advanced.CheckFeature" userdata="selected" />
+        </menu_item_check>
+        <menu_item_check name="Highlighted" label="Highlighted"
+                         shortcut="control|alt|F3">
+          <on_click function="Advanced.ToggleFeature" userdata="highlighted" />
+          <on_check function="Advanced.CheckFeature" userdata="highlighted" />
+        </menu_item_check>
+        <menu_item_check name="Dynamic Textures" label="Dynamic Textures"
+                         shortcut="control|alt|F4">
+          <on_click function="Advanced.ToggleFeature"
+                    userdata="dynamic textures" />
+          <on_check function="Advanced.CheckFeature"
+                    userdata="dynamic textures" />
+        </menu_item_check>
+        <menu_item_check name="Foot Shadows" label="Foot Shadows" 
+                         shortcut="control|alt|F5">
+          <on_click function="Advanced.ToggleFeature" 
+                    userdata="foot shadows" />
+          <on_check function="Advanced.CheckFeature" 
+                    userdata="foot shadows" />
+        </menu_item_check>
+        <menu_item_check name="Fog" label="Fog" shortcut="control|alt|F6">
+          <on_click function="Advanced.ToggleFeature" userdata="fog" />
+          <on_check function="Advanced.CheckFeature" userdata="fog" />
+        </menu_item_check>
+        <menu_item_check name="Palletized Textures"
+                         label="Palletized Textures"
+                         shortcut="control|alt|F7">
+          <on_click function="Advanced.ToggleFeature" userdata="palette" />
+          <on_check function="Advanced.CheckFeature" userdata="palette" />
+        </menu_item_check>
+        <menu_item_check name="Test FRInfo" label="Test FRInfo"
+                         shortcut="control|alt|F8">
+          <on_click function="Advanced.ToggleFeature" userdata="fr info" />
+          <on_check function="Advanced.CheckFeature" userdata="fr info" />
+        </menu_item_check>
+        <menu_item_check name="Flexible Objects" label="Flexible Objects"
+                         shortcut="control|alt|F9">
+          <on_click function="Advanced.ToggleFeature" userdata="flexible" />
+          <on_check function="Advanced.CheckFeature" userdata="flexible" />
+        </menu_item_check>
+      </menu>
+
+
+      <!-- INFO DISPLAYS -->
+      <menu drop_shadow="true" name="Info Displays"
+            opaque="true" tear_off="true">
+        <menu_item_check name="Verify" label="Verify">
+          <on_click function="Advanced.ToggleInfoDisplay" userdata="verify" />
+          <on_check function="Advanced.CheckInfoDisplay" userdata="verify" />
+        </menu_item_check>
+        <menu_item_check name="BBoxes" label="BBoxes">
+          <on_click function="Advanced.ToggleInfoDisplay" userdata="bboxes" />
+          <on_check function="Advanced.CheckInfoDisplay" userdata="bboxes" />
+        </menu_item_check>
+        <menu_item_check name="Points" label="Points">
+          <on_click function="Advanced.ToggleInfoDisplay" userdata="points" />
+          <on_check function="Advanced.CheckInfoDisplay" userdata="points" />
+        </menu_item_check>
+        <menu_item_check name="Octree" label="Octree">
+          <on_click function="Advanced.ToggleInfoDisplay" userdata="octree" />
+          <on_check function="Advanced.CheckInfoDisplay" userdata="octree" />
+        </menu_item_check>
+        <menu_item_check name="Occlusion" label="Occlusion">
+          <on_click function="Advanced.ToggleInfoDisplay" 
+                    userdata="occlusion" />
+          <on_check function="Advanced.CheckInfoDisplay" 
+                    userdata="occlusion" />
+        </menu_item_check>
+        <menu_item_check name="Render Batches" label="Render Batches">
+          <on_click function="Advanced.ToggleInfoDisplay" 
+                    userdata="render batches" />
+          <on_check function="Advanced.CheckInfoDisplay" 
+                    userdata="render batches" />
+        </menu_item_check>
+        <menu_item_check name="Animated Textures" label="Animated Textures">
+          <on_click function="Advanced.ToggleInfoDisplay" 
+                    userdata="texture anim" />
+          <on_check function="Advanced.CheckInfoDisplay" 
+                    userdata="texture anim" />
+        </menu_item_check>
+        <menu_item_check name="Texture Priority" label="Texture Priority">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="texture priority" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="texture priority" />
+        </menu_item_check>
+        <menu_item_check name="Avatar Rendering Cost"
+                         label="Avatar Rendering Cost">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="shame" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="shame" />
+        </menu_item_check>
+        <menu_item_check name="Texture Area (sqrt(A))"
+                         label="Texture Area (sqrt(A))">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="texture area" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="texture area" />
+        </menu_item_check>
+        <menu_item_check name="Face Area (sqrt(A))"
+                         label="Face Area (sqrt(A))">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="face area" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="face area" />
+        </menu_item_check>
+        <menu_item_check name="Pick Render" label="Pick Render">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="picking" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="picking" />
+        </menu_item_check>
+        <menu_item_check name="Lights" label="Lights">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="lights" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="lights" />
+        </menu_item_check>
+        <menu_item_check name="Particles" label="Particles">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="particles" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="particles" />
+        </menu_item_check>
+        <menu_item_check name="Composition" label="Composition">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="composition" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="composition" />
+        </menu_item_check>
+        <menu_item_check name="Glow" label="Glow">
+          <on_click function="Advanced.ToggleInfoDisplay" 
+                    userdata="glow" />
+          <on_check function="Advanced.CheckInfoDisplay" 
+                    userdata="glow" />
+        </menu_item_check>
+        <menu_item_check name="Show Depth Buffer" label="Show Depth Buffer">
+          <on_click function="ToggleControl" userdata="ShowDepthBuffer" />
+          <on_check control="ShowDepthBuffer" />
+        </menu_item_check>
+        <menu_item_check name="Show Select Buffer" label="Show Select Buffer">
+          <on_click function="Advanced.ToggleSelectBuffer" userdata="" />
+          <on_check function="Advanced.CheckSelectBuffer" userdata="" />
+        </menu_item_check>
+        <menu_item_check name="Vectorize Perf Test"
+                         label="Vectorize Perf Test">
+          <on_click function="ToggleControl" userdata="VectorizePerfTest" />
+          <on_check control="VectorizePerfTest" />
+        </menu_item_check>
+      </menu>
+
+
+      <!-- RENDER TESTS -->
+      <menu drop_shadow="true" name="Render Tests" opaque="true"
+            tear_off="true">
+        <menu_item_check name="Camera Offset" label="Camera Offset">
+          <on_click function="ToggleControl" userdata="CameraOffset" />
+          <on_check control="CameraOffset" />
+        </menu_item_check>
+        <menu_item_check name="Randomize Framerate"
+                         label="Randomize Framerate">
+          <on_click function="Advanced.ToggleRandomizeFramerate" 
+                    userdata="" />
+          <on_check function="Advanced.CheckRandomizeFramerate"
+                    userdata="" />
+        </menu_item_check>
+        <menu_item_check name="Periodic Slow Frame" 
+                         label="Periodic Slow Frame">
+          <on_click function="Advanced.TogglePeriodicSlowFrame" 
+                    userdata="" />
+          <on_check function="Advanced.CheckPeriodicSlowFrame" 
+                    userdata="" />
+        </menu_item_check>
+        <menu_item_check name="Frame Test" label="Frame Test">
+          <on_click function="Advanced.ToggleFrameTest" userdata="" />
+          <on_check function="Advanced.CheckFrameTest" userdata="" />
+        </menu_item_check>
+      </menu>
+
+
+      <menu_item_separator />
+
+      <menu_item_check name="Axes" label="Axes">
+        <on_click function="ToggleControl" userdata="ShowAxes" />
+        <on_check control="ShowAxes" />
+      </menu_item_check>
+
+      <menu_item_separator />
+
+      <menu_item_check name="Hide Selected" label="Hide Selected">
+        <on_click function="Advanced.ToggleHideSelectedObjects" 
+                  userdata="" />
+        <on_check function="Advanced.CheckHideSelectedObjects"
+                  userdata="" />
+      </menu_item_check>
+
+      <menu_item_separator />
+
+      <menu_item_check name="Tangent Basis" label="Tangent Basis">
+        <on_click function="ToggleControl" userdata="ShowTangentBasis" />
+        <on_check control="ShowTangentBasis" />
+      </menu_item_check>
+      <menu_item_call name="Selected Texture Info" 
+                      label="Selected Texture Info"
+                      shortcut="control|alt|shift|T">
+        <on_click function="Advanced.SelectedTextureInfo" userdata="" />
+      </menu_item_call>
+      <menu_item_check name="Wireframe" label="Wireframe"
+                       shortcut="control|shift|R">
+        <on_click function="Advanced.ToggleWireframe" userdata="" />
+        <on_check function="Advanced.CheckWireframe" userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Object-Object Occlusion"
+                       label="Object-Object Occlusion"
+                       shortcut="control|shift|O">
+        <on_click function="ToggleControl" userdata="UseOcclusion" />
+        <on_check control="UseOcclusion" />
+      </menu_item_check>
+      <menu_item_check name="Debug GL" label="Debug GL">
+        <on_click function="ToggleControl" userdata="RenderDebugGL" />
+        <on_check control="RenderDebugGL" />
+      </menu_item_check>
+      <menu_item_check name="Debug Pipeline" label="Debug Pipeline">
+        <on_click function="ToggleControl" userdata="RenderDebugPipeline" />
+        <on_check control="RenderDebugPipeline" />
+      </menu_item_check>
+      <menu_item_check name="Fast Alpha" label="Fast Alpha">
+        <on_click function="ToggleControl" userdata="RenderFastAlpha" />
+        <on_check control="RenderFastAlpha" />
+      </menu_item_check>
+      <menu_item_check name="Animate Textures" label="Animate Textures">
+        <on_click function="ToggleControl" userdata="AnimateTextures" />
+        <on_check control="AnimateTextures" />
+      </menu_item_check>
+      <menu_item_check name="Disable Textures" label="Disable Textures">
+        <on_click function="Advanced.ToggleDisableTextures" userdata="" />
+        <on_check function="Advanced.CheckDisableTextures" userdata="" />
+      </menu_item_check>
+      <menu_item_check name="HTTP Get Textures" label="HTTP Get Textures">
+        <on_click function="ToggleControl" 
+                  userdata="ImagePipelineUseHTTP" />
+        <on_check control="ImagePipelineUseHTTP" />
+      </menu_item_check>
+      <menu_item_check name="Run Multiple Threads"
+                       label="Run Multiple Threads">
+        <on_click function="ToggleControl" 
+                  userdata="RunMultipleThreads" />
+        <on_check control="RunMultipleThreads" />
+      </menu_item_check>
+      <!-- Disabled because it doesn't work very well?
+      <menu_item_check name="Dynamic Reflections" 
+                       label="Dynamic Reflections">
+        <on_click function="ToggleControl"
+                  userdata="RenderDynamicReflections" />
+        <on_check control="RenderDynamicReflections" />
+      </menu_item_check>
+      -->
+      <menu_item_check name="Cheesy Beacon" label="Cheesy Beacon">
+        <on_click function="ToggleControl" 
+                  userdata="CheesyBeacon" />
+        <on_check control="CheesyBeacon" />
+      </menu_item_check>
+    </menu>
+
+
+
+    <!-- WORLD -->
+
+    <menu drop_shadow="true" name="World" opaque="true" tear_off="true">
+      <!-- Disabled because you can't do this in Windlight.
+      <menu_item_check name="Mouse Moves Sun" label="Mouse Moves Sun"
+                       shortcut="control|alt|M">
+        <on_click function="ToggleControl" userdata="MouseSun" />
+        <on_check control="MouseSun" />
+      </menu_item_check>
+      -->
+      <menu_item_check name="Sim Sun Override" label="Sim Sun Override">
+        <on_click function="ToggleControl"
+                  userdata="SkyOverrideSimSunPosition" />
+        <on_check control="SkyOverrideSimSunPosition" />
+      </menu_item_check>
+      <menu_item_call name="Dump Scripted Camera" 
+                      label="Dump Scripted Camera">
+        <on_click function="Advanced.DumpScriptedCamera" userdata="" />
+      </menu_item_call>
+      <menu_item_check name="Fixed Weather" label="Fixed Weather">
+        <on_click function="ToggleControl" userdata="FixedWeather" />
+        <on_check control="FixedWeather" />
+      </menu_item_check>
+      <menu_item_call name="Dump Region Object Cache"
+                      label="Dump Region Object Cache">
+        <on_click function="Advanced.DumpRegionObjectCache" userdata="" />
+      </menu_item_call>
+    </menu>
+
+
+
+    <!-- UI -->
+
+    <menu drop_shadow="true" name="UI" opaque="true" tear_off="true">
+      <menu_item_call name="SLURL Test" label="SLURL Test">
+        <on_click function="Advanced.SLURLTest" userdata="" />
+      </menu_item_call>
+
+      <!-- 
+           *TODO: Make this a proper toggle item with the "X" indicator.
+           1. Add a "Advanced.CheckEditableUI" function in llviewermenu.cpp.
+           2. Change this surrounding menu_item_call to a menu_item_check.
+           3. Uncomment the "on_check" line below.
+        -->
+      <menu_item_call name="Editable UI" label="Editable UI">
+        <on_click function="Advanced.ToggleEditableUI" userdata="" />
+        <!--
+        <on_check function="Advanced.CheckEditableUI" userdata="" />
+        -->
+      </menu_item_call>
+
+      <menu_item_check name="Async Keystrokes" label="Async Keystrokes">
+        <on_click function="Advanced.ToggleAsyncKeystrokes" userdata="" />
+        <on_check function="Advanced.CheckAsyncKeystrokes" userdata="" />
+      </menu_item_check>
+      <menu_item_call name="Dump SelectMgr" label="Dump SelectMgr">
+        <on_click function="Advanced.DumpSelectMgr" userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Dump Inventory" label="Dump Inventory">
+        <on_click function="Advanced.DumpInventory" userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Dump Focus Holder"
+                      label="Dump Focus Holder" shortcut="control|alt|F">
+        <on_click function="Advanced.DumpFocusHolder" userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Print Selected Object Info"
+                      label="Print Selected Object Info"
+                      shortcut="control|shift|P">
+        <on_click function="Advanced.PrintSelectedObjectInfo" userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Print Agent Info" label="Print Agent Info" 
+                      shortcut="shift|P">
+        <on_click function="Advanced.PrintAgentInfo" userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Memory Stats" label="Memory Stats"
+                      shortcut="control|alt|shift|M">
+        <on_click function="Advanced.PrintTextureMemoryStats" userdata="" />
+      </menu_item_call>
+      <menu_item_check name="Double-Click Auto-Pilot"
+                       label="Double-Click Auto-Pilot">
+        <on_click function="ToggleControl" userdata="DoubleClickAutoPilot" />
+        <on_check control="DoubleClickAutoPilot" />
+      </menu_item_check>
+      <menu_item_separator />
+      <menu_item_check name="Debug SelectMgr" label="Debug SelectMgr">
+        <on_click function="Advanced.ToggleDebugSelectMgr" userdata="" />
+        <on_check function="Advanced.CheckDebugSelectMgr" userdata="" />
+      </menu_item_check>
+      <menu_item_check label="Debug Click" name="Debug Clicks">
+        <on_click function="Advanced.ToggleDebugClicks" userdata="" />
+        <on_check function="Advanced.CheckDebugClicks" userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Debug Views" label="Debug Views">
+        <on_click function="Advanced.ToggleDebugViews" userdata="" />
+        <on_check function="Advanced.CheckDebugViews" userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Show Name Tooltips" label="Show Name Tooltips">
+        <on_click function="Advanced.ToggleXUINameTooltips" userdata="" />
+        <on_check function="Advanced.CheckXUINameTooltips" userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Debug Mouse Events" label="Debug Mouse Events">
+        <on_click function="Advanced.ToggleDebugMouseEvents" userdata="" />
+        <on_check function="Advanced.CheckDebugMouseEvents" userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Debug Keys" label="Debug Keys">
+        <on_click function="Advanced.ToggleDebugKeys" userdata="" />
+        <on_check function="Advanced.CheckDebugKeys" userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Debug WindowProc" label="Debug WindowProc">
+        <on_click function="Advanced.ToggleDebugWindowProc" userdata="" />
+        <on_check function="Advanced.CheckDebugWindowProc" userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Debug Text Editor Tips"
+                       label="Debug Text Editor Tips">
+        <on_click function="Advanced.ToggleDebugTextEditorTips" userdata="" />
+        <on_check function="Advanced.CheckDebugTextEditorTips" userdata="" />
+      </menu_item_check>
+      <menu_item_separator />
+      <menu_item_check name="Show Time" label="Show Time">
+        <on_click function="ToggleControl" userdata="DebugShowTime" />
+        <on_check control="DebugShowTime" />
+      </menu_item_check>
+      <menu_item_check name="Show Render Info" label="Show Render Info">
+        <on_click function="ToggleControl" userdata="DebugShowRenderInfo" />
+        <on_check control="DebugShowRenderInfo" />
+      </menu_item_check>
+      <menu_item_check name="Show Color Under Cursor"
+                       label="Show Color Under Cursor">
+        <on_click function="ToggleControl" userdata="DebugShowColor" />
+        <on_check control="DebugShowColor" />
+      </menu_item_check>
+    </menu>
+
+
+
+    <!-- XUI -->
+
+    <menu drop_shadow="true" name="XUI" opaque="true" tear_off="true">
+      <menu_item_call name="Floater Test..." label="Floater Test...">
+        <on_click function="Advanced.ShowFloaterTest" userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Export Menus to XML..."
+                      label="Export Menus to XML...">
+        <on_click function="Advanced.ExportMenusToXML" userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Edit UI..." label="Edit UI...">
+        <on_click function="Advanced.EditUI" userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Load from XML..." label="Load from XML...">
+        <on_click function="Advanced.LoadUIFromXML" userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Save to XML..." label="Save to XML...">
+        <on_click function="Advanced.SaveUIToXML" userdata="" />
+      </menu_item_call>
+      <menu_item_check name="Show XUI Names" label="Show XUI Names">
+        <on_click function="Advanced.ToggleXUINames" userdata="" />
+        <on_check function="Advanced.CheckXUINames" userdata="" />
+      </menu_item_check>
+    </menu>
+
+
+
+    <!-- CHARACTER -->
+
+    <menu name="Character" drop_shadow="true" opaque="true" tear_off="true">
+
+      <menu name="Grab Baked Texture" drop_shadow="true"
+            opaque="true" tear_off="true">
+        <menu_item_call enabled="false" name="Iris" label="Iris">
+          <on_click function="Advanced.GrabBakedTexture" userdata="eyes" />
+          <on_enable function="Advanced.EnableGrabBakedTexture"
+                     userdata="eyes" />
+        </menu_item_call>
+        <menu_item_call enabled="false" name="Head" label="Head">
+          <on_click function="Advanced.GrabBakedTexture" userdata="head" />
+          <on_enable function="Advanced.EnableGrabBakedTexture"
+                     userdata="head" />
+        </menu_item_call>
+        <menu_item_call enabled="false" name="Upper Body" label="Upper Body">
+          <on_click function="Advanced.GrabBakedTexture" userdata="upper" />
+          <on_enable function="Advanced.EnableGrabBakedTexture"
+                     userdata="upper" />
+        </menu_item_call>
+        <menu_item_call enabled="false" name="Lower Body" label="Lower Body">
+          <on_click function="Advanced.GrabBakedTexture" userdata="lower" />
+          <on_enable function="Advanced.EnableGrabBakedTexture"
+                     userdata="lower" />
+        </menu_item_call>
+        <menu_item_call enabled="false" name="Skirt" label="Skirt">
+          <on_click function="Advanced.GrabBakedTexture" userdata="skirt" />
+          <on_enable function="Advanced.EnableGrabBakedTexture"
+                     userdata="skirt" />
+        </menu_item_call>
+      </menu>
+
+      <!-- CHARACTER TESTS -->
+      <menu drop_shadow="true" name="Character Tests"
+            opaque="true" tear_off="true">
+        <menu_item_check name="Go Away/AFK When Idle"
+                         label="Go Away/AFK When Idle">
+          <on_click function="Advanced.ToggleAllowIdleAFK" userdata="" />
+          <on_check function="Advanced.CheckAllowIdleAFK" userdata="" />
+        </menu_item_check>
+        <menu_item_call name="Appearance To XML" label="Appearance To XML">
+          <on_click function="Advanced.ToggleAppearanceToXML" userdata="" />
+        </menu_item_call>
+        <menu_item_call name="Toggle Character Geometry" enabled="false"
+                        label="Toggle Character Geometry">
+          <on_click function="Advanced.ToggleCharacterGeometry" userdata="" />
+          <on_enable function="EnableGodCustomerService" userdata="" />
+        </menu_item_call>
+        <menu_item_call name="Test Male" label="Test Male">
+          <on_click function="Advanced.TestMale" userdata="" />
+        </menu_item_call>
+        <menu_item_call name="Test Female" label="Test Female">
+          <on_click function="Advanced.TestFemale" userdata="" />
+        </menu_item_call>
+        <menu_item_call name="Toggle PG" label="Toggle PG">
+          <on_click function="Advanced.TogglePG" userdata="" />
+        </menu_item_call>
+        <menu_item_check name="Allow Select Avatar"
+                         label="Allow Select Avatar">
+          <on_click function="Advanced.ToggleAllowSelectAvatar" userdata="" />
+          <on_check function="Advanced.CheckAllowSelectAvatar" userdata="" />
+        </menu_item_check>
+      </menu>
+
+      <menu_item_check name="Enable Lip Sync (Beta)" 
+                       label="Enable Lip Sync (Beta)">
+        <on_click function="ToggleControl" userdata="LipSyncEnabled" />
+        <on_check control="LipSyncEnabled" />
+      </menu_item_check>
+      <menu_item_check name="Tap-Tap-Hold To Run" 
+                       label="Tap-Tap-Hold To Run">
+        <on_click function="Advanced.ToggleAllowTapTapHoldRun" userdata="" />
+        <on_check function="Advanced.CheckAllowTapTapHoldRun" userdata="" />
+      </menu_item_check>
+      <menu_item_call name="Force Params to Default"
+                      label="Force Params to Default">
+        <on_click function="Advanced.ForceParamsToDefault" userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Reload Vertex Shader"
+                      label="Reload Vertex Shader">
+        <on_click function="Advanced.ReloadVertexShader" userdata="" />
+      </menu_item_call>
+      <menu_item_check label="Animation Info"
+                       name="Animation Info">
+        <on_click function="Advanced.ToggleAnimationInfo" userdata="" />
+        <on_check function="Advanced.CheckAnimationInfo" userdata="" />
+      </menu_item_check>
+
+      <!-- 
+           *TODO: Make this a proper toggle item with the "X" indicator.
+           1. Add a "Advanced.CheckSlowmotionAnimation" function in 
+           llviewermenu.cpp.
+           2. Change this surrounding menu_item_call to a menu_item_check.
+           3. Uncomment the "on_check" line below.
+        -->
+      <menu_item_call name="Slow Motion Animations"
+                      label="Slow Motion Animations">
+        <on_click function="Advanced.ToggleSlowMotionAnimations" userdata="" />
+        <!-- 
+        <on_check function="Advanced.CheckSlowMotionAnimations"
+                  userdata="" /> 
+        -->
+      </menu_item_call>
+
+      <menu_item_check name="Show Look At" label="Show Look At">
+        <on_click function="Advanced.ToggleShowLookAt" userdata="" />
+        <on_check function="Advanced.CheckShowLookAt" userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Show Point At" label="Show Point At">
+        <on_click function="Advanced.ToggleShowPointAt" userdata="" />
+        <on_check function="Advanced.CheckShowPointAt" userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Debug Joint Updates" label="Debug Joint Updates">
+        <on_click function="Advanced.ToggleDebugJointUpdates" userdata="" />
+        <on_check function="Advanced.CheckDebugJointUpdates" userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Disable LOD" label="Disable LOD">
+        <on_click function="Advanced.ToggleDisableLOD" userdata="" />
+        <on_check function="Advanced.CheckDisableLOD" userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Debug Character Vis" label="Debug Character Vis">
+        <on_click function="Advanced.ToggleDebugCharacterVis" userdata="" />
+        <on_check function="Advanced.CheckDebugCharacterVis" userdata="" />
+      </menu_item_check>
+
+      <!--  Disabled. See DEV-14477
+      <menu_item_check name="Show Collision Plane"
+                       label="Show Collision Plane">
+        <on_click function="Advanced.ToggleShowCollisionPlane"
+                  userdata="" />
+        <on_check function="Advanced.CheckShowCollisionPlane"
+                  userdata="" />
+      </menu_item_check>
+      -->
+
+      <menu_item_check name="Show Collision Skeleton"
+                       label="Show Collision Skeleton">
+        <on_click function="Advanced.ToggleShowCollisionSkeleton"
+                  userdata="" />
+        <on_check function="Advanced.CheckShowCollisionSkeleton"
+                  userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Display Agent Target"
+                       label="Display Agent Target">
+        <on_click function="Advanced.ToggleDisplayAgentTarget" userdata="" />
+        <on_check function="Advanced.CheckDisplayAgentTarget" userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Debug Rotation" label="Debug Rotation">
+        <on_click function="Advanced.ToggleDebugAvatarRotation" userdata="" />
+        <on_check function="Advanced.CheckDebugAvatarRotation" userdata="" />
+      </menu_item_check>
+      <menu_item_call name="Dump Attachments" label="Dump Attachments">
+        <on_click function="Advanced.DumpAttachments" userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Rebake Textures" label="Rebake Textures"
+                      shortcut="control|alt|R">
+        <on_click function="Advanced.RebakeTextures" userdata="" />
+      </menu_item_call>
+    </menu>
+
+
+
+    <!-- NETWORK -->
+
+    <menu drop_shadow="true" name="Network" opaque="true" tear_off="true">
+      <menu_item_call name="Enable Message Log" label="Enable Message Log">
+        <on_click function="Advanced.EnableMessageLog" userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Disable Message Log" label="Disable Message Log">
+        <on_click function="Advanced.DisableMessageLog" userdata="" />
+      </menu_item_call>
+      <menu_item_separator />
+      <menu_item_check name="Velocity Interpolate Objects"
+                       label="Velocity Interpolate Objects">
+        <on_click function="ToggleControl" userdata="VelocityInterpolate" />
+        <on_check control="VelocityInterpolate" />
+      </menu_item_check>
+      <menu_item_check name="Ping Interpolate Object Positions"
+                       label="Ping Interpolate Object Positions">
+        <on_click function="ToggleControl" userdata="PingInterpolate" />
+        <on_check control="PingInterpolate" />
+      </menu_item_check>
+      <menu_item_separator />
+      <menu_item_call name="Drop a Packet" label="Drop a Packet"
+                      shortcut="control|alt|L">
+        <on_click function="Advanced.DropPacket" userdata="" />
+      </menu_item_call>
+    </menu>
+
+
+
+    <!-- RECORDER -->
+
+    <menu name="Recorder" drop_shadow="true" opaque="true" tear_off="true">
+      <menu_item_check name="Full Session Logging"
+                       label="Full Session Logging">
+        <on_click function="ToggleControl"
+                  userdata="StatsSessionTrackFrameStats" />
+        <on_check control="StatsSessionTrackFrameStats" />
+      </menu_item_check>
+      <menu_item_call name="Start Logging" label="Start Logging">
+        <on_click function="Advanced.FrameStatsLogging" 
+                  userdata="start logging" />
+      </menu_item_call>
+      <menu_item_call name="Stop Logging" label="Stop Logging">
+        <on_click function="Advanced.FrameStatsLogging"
+                  userdata="stop logging" />
+      </menu_item_call>
+      <menu_item_call name="Log 10 Seconds" label="Log 10 Seconds">
+        <on_click function="Advanced.FrameStatsLogging"
+                  userdata="timed logging 10" />
+      </menu_item_call>
+      <menu_item_call name="Log 30 Seconds" label="Log 30 Seconds">
+        <on_click function="Advanced.FrameStatsLogging"
+                  userdata="timed logging 30" />
+      </menu_item_call>
+      <menu_item_call name="Log 60 Seconds" label="Log 60 Seconds">
+        <on_click function="Advanced.FrameStatsLogging"
+                  userdata="timed logging 60" />
+      </menu_item_call>
+
+      <menu_item_separator />
+
+      <menu_item_call name="Start Playback" label="Start Playback">
+        <on_click function="Advanced.AgentPilot" userdata="start playback" />
+      </menu_item_call>
+      <menu_item_call name="Stop Playback" label="Stop Playback">
+        <on_click function="Advanced.AgentPilot" userdata="stop playback" />
+      </menu_item_call>
+      <menu_item_check name="Loop Playback" label="Loop Playback">
+        <on_click function="Advanced.ToggleAgentPilotLoop" userdata="" />
+        <on_check function="Advanced.CheckAgentPilotLoop" userdata="" />
+      </menu_item_check>
+      <menu_item_call name="Start Record" label="Start Record">
+        <on_click function="Advanced.AgentPilot" userdata="start record" />
+      </menu_item_call>
+      <menu_item_call name="Stop Record" label="Stop Record">
+        <on_click function="Advanced.AgentPilot" userdata="stop record" />
+      </menu_item_call>
+    </menu>
+
+
+    <menu_item_separator />
+
+
+    <menu_item_check name="Show Updates" label="Show Updates"
+                     shortcut="control|alt|shift|U">
+      <on_click function="Advanced.ToggleShowObjectUpdates" userdata="" />
+      <on_check function="Advanced.CheckShowObjectUpdates" userdata="" />
+    </menu_item_check>
+
+    <menu_item_separator />
+
+    <menu_item_call name="Compress Image..."
+                    label="Compress Image...">
+      <on_click function="Advanced.CompressImage" userdata="" />
+    </menu_item_call>
+    <menu_item_check name="Limit Select Distance"
+                     label="Limit Select Distance">
+      <on_click function="ToggleControl"
+                userdata="LimitSelectDistance" />
+      <on_check control="LimitSelectDistance" />
+    </menu_item_check>
+    <menu_item_check name="Disable Camera Constraints"
+                     label="Disable Camera Constraints">
+      <on_click function="ToggleControl"
+                userdata="DisableCameraConstraints" />
+      <on_check control="DisableCameraConstraints" />
+    </menu_item_check>
+    <menu_item_check name="Mouse Smoothing" label="Mouse Smoothing">
+      <on_click function="ToggleControl"
+                userdata="MouseSmooth" />
+      <on_check control="MouseSmooth" />
+    </menu_item_check>
+
+    <menu_item_separator />
+
+    <menu_item_check name="Console Window" label="Console Window">
+      <on_click function="ToggleControl" 
+                userdata="ShowConsoleWindow" />
+      <on_check control="ShowConsoleWindow" />
+    </menu_item_check>
+    <menu_item_check name="Output Debug Minidump"
+                     label="Output Debug Minidump">
+      <on_click function="ToggleControl" 
+                userdata="SaveMiniDump" />
+      <on_check control="SaveMiniDump" />
+    </menu_item_check>
+    <menu_item_check name="Clothing..." label="Clothing...">
+      <on_click function="Advanced.ToggleClothingFloater" userdata="" />
+    </menu_item_check>
+    <menu_item_call name="Debug Settings" label="Debug Settings">
+      <on_click function="Advanced.ShowDebugSettings" userdata="" />
+    </menu_item_call>
+    <menu_item_check name="View Admin Options" label="View Admin Options"
+                     shortcut="control|alt|V">
+      <on_click function="Advanced.ToggleViewAdminOptions" userdata="" />
+      <on_check function="Advanced.CheckViewAdminOptions" userdata="" />
+    </menu_item_check>
+    <menu_item_call name="Request Admin Status" label="Request Admin Status"
+                    shortcut="control|alt|G">
+      <on_click function="Advanced.RequestAdminStatus" userdata="" />
+    </menu_item_call>
+    <menu_item_call name="Leave Admin Status" label="Leave Admin Status"
+                    shortcut="control|alt|shift|G">
+      <on_click function="Advanced.LeaveAdminStatus" userdata="" />
+    </menu_item_call>
+
+  </menu>
+
+
 </menu_bar>