Index: jacek/doc/contributions.txt
===================================================================
--- jacek/doc/contributions.txt	(revision 58)
+++ jacek/doc/contributions.txt	(revision 59)
@@ -136,6 +136,7 @@
 	VWR-427
 	VWR-597
 	VWR-2947
+	VWR-2948
 Joghert LeSabre
 	VWR-64
 Kage Pixel
Index: jacek/indra/newview/llviewermenu.cpp
===================================================================
--- jacek/indra/newview/llviewermenu.cpp	(revision 58)
+++ jacek/indra/newview/llviewermenu.cpp	(revision 59)
@@ -654,7 +654,9 @@
 		gMenuBarView->getChildByName("Menu Undershirt", TRUE)->setVisible(FALSE);
 	}
 
-	// TomY TODO convert these two
+// Client and Server menus are now XUI in menu_viewer.xml,
+// so we'll disable creating duplicates here.
+#if 0
 	LLMenuGL*menu;
 	menu = new LLMenuGL(CLIENT_MENU_NAME);
 	init_client_menu(menu);
@@ -665,6 +667,7 @@
 	init_server_menu(menu);
 	gMenuBarView->appendMenu( menu );
 	menu->updateParent(LLMenuGL::sMenuContainer);
+#endif
 
 	gMenuBarView->createJumpKeys();
 
Index: jacek/indra/newview/skins/xui/en-us/menu_viewer.xml
===================================================================
--- jacek/indra/newview/skins/xui/en-us/menu_viewer.xml	(revision 58)
+++ jacek/indra/newview/skins/xui/en-us/menu_viewer.xml	(revision 59)
@@ -927,4 +927,1092 @@
 			<on_click function="ShowFloater" userdata="about" />
 		</menu_item_call>
 	</menu>
+
+
+
+	<menu bottom="158" drop_shadow="true" enabled="true" height="574"
+	     hidden="false" left="269" mouse_opaque="false" name="Client" opaque="true"
+	     tear_off="true" width="299">
+		<tearoff_menu bottom="-10" enabled="true" height="10" hidden="false" label="~~~~~~~~~~~"
+		     left="0" mouse_opaque="true" name="tear off" width="299" />
+		<menu bottom="-200" drop_shadow="true" enabled="true" height="182"
+		     hidden="false" left="568" mouse_opaque="false" name="Consoles"
+		     opaque="true" tear_off="true" width="226">
+			<tearoff_menu bottom="-10" enabled="true" height="10" hidden="false" label="~~~~~~~~~~~"
+			     left="0" mouse_opaque="true" name="tear off" width="226" />
+			<menu_item_check bottom="-30" enabled="true" height="20" hidden="false" label="Frame Console"
+			     left="0" mouse_opaque="true" name="Frame Console"
+			     shortcut="control|shift|2" width="226" >
+				<on_click function="Client.ToggleConsole" userdata="frame" />
+				<on_check function="Client.CheckConsole" userdata="frame" />
+			</menu_item_check>
+			<menu_item_check bottom="-50" enabled="true" height="20" hidden="false" label="Texture Console"
+			     left="0" mouse_opaque="true" name="Texture Console"
+			     shortcut="control|shift|3" width="226" >
+				<on_click function="Client.ToggleConsole" userdata="texture" />
+				<on_check function="Client.CheckConsole" userdata="texture" />
+			</menu_item_check>
+			<menu_item_check bottom="-70" enabled="true" height="20" hidden="false" label="Debug Console"
+			     left="0" mouse_opaque="true" name="Debug Console"
+			     shortcut="control|shift|4" width="226" >
+				<on_click function="Client.ToggleConsole" userdata="debug" />
+				<on_check function="Client.CheckConsole" userdata="debug" />
+			</menu_item_check>
+			<menu_item_check bottom="-90" enabled="true" height="20" hidden="false" label="Fast Timers"
+			     left="0" mouse_opaque="true" name="Fast Timers" shortcut="control|shift|9"
+			     width="226" >
+				<on_click function="Client.ToggleConsole" userdata="fast timers" />
+				<on_check function="Client.CheckConsole" userdata="fast timers" />
+			</menu_item_check>
+			<menu_item_check bottom="-110" enabled="true" height="20" hidden="false" label="Memory" left="0"
+			     mouse_opaque="true" name="Memory" shortcut="control|shift|0" width="226" >
+				<on_click function="Client.ToggleConsole" userdata="memory" />
+				<on_check function="Client.CheckConsole" userdata="memory" />
+			</menu_item_check>
+			<menu_item_separator bottom="-118" enabled="true" height="8" hidden="false" label="-----------"
+			     left="0" mouse_opaque="true" name="separator" width="226" />
+			<menu_item_call bottom="-138" enabled="true" height="20" hidden="false"
+			     label="Region Info to Debug Console" left="0" mouse_opaque="true"
+			     name="Region Info to Debug Console" width="226" >
+				<on_click function="Client.DumpInfoToConsole" userdata="region" />
+			</menu_item_call>
+			<menu_item_call bottom="-158" enabled="true" height="20" hidden="false"
+			     label="Group Info to Debug Console" left="0" mouse_opaque="true"
+			     name="Group Info to Debug Console" width="226" >
+				<on_click function="Client.DumpInfoToConsole" userdata="group" />
+			</menu_item_call>
+			<menu_item_call bottom="-178" enabled="true" height="20" hidden="false"
+			     label="Capabilities Info to Debug Console" left="0" mouse_opaque="true"
+			     name="Capabilities Info to Debug Console" width="226" >
+				<on_click function="Client.DumpInfoToConsole" userdata="capabilities" />
+			</menu_item_call>
+		</menu>
+		<menu_item_call bottom="-50" enabled="true" height="20" hidden="false"
+		     label="Reload personal settings overrides" left="0" mouse_opaque="true"
+		     name="Reload personal setting overrides" shortcut="control|shift|F2"
+		     width="299" >
+			<on_click function="Client.ReloadSettingsOverrides" userdata="" />
+		</menu_item_call>
+		<menu bottom="-768" drop_shadow="true" enabled="true" height="94"
+		     hidden="false" left="0" mouse_opaque="false" name="HUD Info" opaque="true"
+		     tear_off="true" width="112">
+			<tearoff_menu bottom="-10" enabled="true" height="10" hidden="false" label="~~~~~~~~~~~"
+			     left="0" mouse_opaque="true" name="tear off" width="112" />
+			<menu_item_check bottom="-30" enabled="true" height="20" hidden="false" label="Velocity"
+			     left="0" mouse_opaque="true" name="Velocity" width="112" >
+				<on_click function="Client.ToggleHUDInfo" userdata="velocity" />
+				<on_check function="Client.CheckHUDInfo" userdata="velocity" />
+			</menu_item_check>
+			<menu_item_check bottom="-50" enabled="true" height="20" hidden="false" label="Camera" left="0"
+			     mouse_opaque="true" name="Camera" width="112" >
+				<on_click function="Client.ToggleHUDInfo" userdata="camera" />
+				<on_check function="Client.CheckHUDInfo" userdata="camera" />
+			</menu_item_check>
+			<menu_item_check bottom="-70" enabled="true" height="20" hidden="false" label="Wind" left="0"
+			     mouse_opaque="true" name="Wind" width="112" >
+				<on_click function="Client.ToggleHUDInfo" userdata="wind" />
+				<on_check function="Client.CheckHUDInfo" userdata="wind" />
+			</menu_item_check>
+			<menu_item_check bottom="-90" enabled="true" height="20" hidden="false" label="FOV" left="0"
+			     mouse_opaque="true" name="FOV" width="112" >
+				<on_click function="Client.ToggleHUDInfo" userdata="fov" />
+				<on_check function="Client.CheckHUDInfo" userdata="fov" />
+			</menu_item_check>
+		</menu>
+		<menu_item_separator bottom="-78" enabled="true" height="8" hidden="false" label="-----------"
+		     left="0" mouse_opaque="true" name="separator" width="299" />
+		<menu_item_check bottom="-98" enabled="true" height="20" hidden="false"
+		     label="High-res Snapshot" left="0" mouse_opaque="true"
+		     name="High-res Snapshot" width="299" >
+			<on_click function="ToggleControl" userdata="HighResSnapshot" />
+			<on_check control="HighResSnapshot" />
+		</menu_item_check>
+		<menu_item_check bottom="-118" enabled="true" height="20" hidden="false"
+		     label="Quiet Snapshots to Disk" left="0" mouse_opaque="true"
+		     name="Quiet Snapshots to Disk" width="299" >
+			<on_click function="ToggleControl" userdata="QuietSnapshotsToDisk" />
+			<on_check control="QuietSnapshotsToDisk" />
+		</menu_item_check>
+		<menu_item_check bottom="-138" enabled="true" height="20" hidden="false"
+		     label="Compress Snapshots to Disk" left="0" mouse_opaque="true"
+		     name="Compress Snapshots to Disk" width="299" >
+			<on_click function="ToggleControl" userdata="CompressSnapshotsToDisk" />
+			<on_check control="CompressSnapshotsToDisk" />
+		</menu_item_check>
+		<menu_item_check bottom="-158" enabled="true" height="20" hidden="false"
+		     label="Show Mouselook Crosshairs" left="0" mouse_opaque="true"
+		     name="Show Mouselook Crosshairs" width="299" >
+			<on_click function="ToggleControl" userdata="ShowCrosshairs" />
+			<on_check control="ShowCrosshairs" />
+		</menu_item_check>
+		<menu_item_check bottom="-178" enabled="true" height="20" hidden="false"
+		     label="Debug Permissions" left="0" mouse_opaque="true"
+		     name="Debug Permissions" width="299" >
+			<on_click function="ToggleControl" userdata="DebugPermissions" />
+			<on_check control="DebugPermissions" />
+		</menu_item_check>
+		<menu_item_call bottom="-198" enabled="true" height="20" hidden="false"
+		     label="Clear Group Cache" left="0" mouse_opaque="true"
+		     name="Clear Group Cache" width="299" >
+			<on_click function="Client.ClearGroupCache" userdata="" />
+		</menu_item_call>
+		<menu_item_separator bottom="-206" enabled="true" height="8" hidden="false" label="-----------"
+		     left="0" mouse_opaque="true" name="separator" width="299" />
+		<menu bottom="-532" drop_shadow="true" enabled="true" height="318"
+		     hidden="false" left="568" mouse_opaque="false" name="Rendering"
+		     opaque="true" tear_off="true" width="246">
+			<tearoff_menu bottom="-10" enabled="true" height="10" hidden="false" label="~~~~~~~~~~~"
+			     left="0" mouse_opaque="true" name="tear off" width="246" />
+			<menu bottom="-768" drop_shadow="true" enabled="true" height="274"
+			     hidden="false" left="0" mouse_opaque="false" name="Types" opaque="true"
+			     tear_off="true" width="203">
+				<tearoff_menu bottom="-10" enabled="true" height="10" hidden="false" label="~~~~~~~~~~~"
+				     left="0" mouse_opaque="true" name="tear off" width="203" />
+				<menu_item_check bottom="-30" enabled="true" height="20" hidden="false" label="Simple" left="0"
+				     mouse_opaque="true" name="Simple" shortcut="control|alt|shift|1"
+				     width="203" >
+					<on_click function="Client.ToggleRenderType" userdata="simple" />
+					<on_check function="Client.CheckRenderType" userdata="simple" />
+				</menu_item_check>
+				<menu_item_check bottom="-50" enabled="true" height="20" hidden="false" label="Alpha" left="0"
+				     mouse_opaque="true" name="Alpha" shortcut="control|alt|shift|2" width="203" >
+					<on_click function="Client.ToggleRenderType" userdata="alpha" />
+					<on_check function="Client.CheckRenderType" userdata="alpha" />
+				</menu_item_check>
+				<menu_item_check bottom="-70" enabled="true" height="20" hidden="false" label="Tree" left="0"
+				     mouse_opaque="true" name="Tree" shortcut="control|alt|shift|3" width="203" >
+					<on_click function="Client.ToggleRenderType" userdata="tree" />
+					<on_check function="Client.CheckRenderType" userdata="tree" />
+				</menu_item_check>
+				<menu_item_check bottom="-90" enabled="true" height="20" hidden="false" label="Character"
+				     left="0" mouse_opaque="true" name="Character"
+				     shortcut="control|alt|shift|4" width="203" >
+					<on_click function="Client.ToggleRenderType" userdata="avatar" />
+					<on_check function="Client.CheckRenderType" userdata="avatar" />
+				</menu_item_check>
+				<menu_item_check bottom="-110" enabled="true" height="20" hidden="false" label="SurfacePatch"
+				     left="0" mouse_opaque="true" name="SurfacePatch"
+				     shortcut="control|alt|shift|5" width="203" >
+					<on_click function="Client.ToggleRenderType" userdata="terrain" />
+					<on_check function="Client.CheckRenderType" userdata="terrain" />
+				</menu_item_check>
+				<menu_item_check bottom="-130" enabled="true" height="20" hidden="false" label="Sky" left="0"
+				     mouse_opaque="true" name="Sky" shortcut="control|alt|shift|6" width="203" >
+					<on_click function="Client.ToggleRenderType" userdata="sky" />
+					<on_check function="Client.CheckRenderType" userdata="sky" />
+				</menu_item_check>
+				<menu_item_check bottom="-150" enabled="true" height="20" hidden="false" label="Water" left="0"
+				     mouse_opaque="true" name="Water" shortcut="control|alt|shift|7" width="203" >
+					<on_click function="Client.ToggleRenderType" userdata="water" />
+					<on_check function="Client.CheckRenderType" userdata="water" />
+				</menu_item_check>
+				<menu_item_check bottom="-170" enabled="true" height="20" hidden="false" label="Ground" left="0"
+				     mouse_opaque="true" name="Ground" shortcut="control|alt|shift|8"
+				     width="203" >
+					<on_click function="Client.ToggleRenderType" userdata="ground" />
+					<on_check function="Client.CheckRenderType" userdata="ground" />
+				</menu_item_check>
+				<menu_item_check bottom="-190" enabled="true" height="20" hidden="false" label="Volume" left="0"
+				     mouse_opaque="true" name="Volume" shortcut="control|alt|shift|9"
+				     width="203" >
+					<on_click function="Client.ToggleRenderType" userdata="volume" />
+					<on_check function="Client.CheckRenderType" userdata="volume" />
+				</menu_item_check>
+				<menu_item_check bottom="-210" enabled="true" height="20" hidden="false" label="Grass" left="0"
+				     mouse_opaque="true" name="Grass" shortcut="control|alt|shift|0" width="203" >
+					<on_click function="Client.ToggleRenderType" userdata="grass" />
+					<on_check function="Client.CheckRenderType" userdata="grass" />
+				</menu_item_check>
+				<menu_item_check bottom="-230" enabled="true" height="20" hidden="false" label="Clouds" left="0"
+				     mouse_opaque="true" name="Clouds" shortcut="control|alt|shift|-"
+				     width="203" >
+					<on_click function="Client.ToggleRenderType" userdata="clouds" />
+					<on_check function="Client.CheckRenderType" userdata="clouds" />
+				</menu_item_check>
+				<menu_item_check bottom="-250" enabled="true" height="20" hidden="false" label="Particles"
+				     left="0" mouse_opaque="true" name="Particles"
+				     shortcut="control|alt|shift|=" width="203" >
+					<on_click function="Client.ToggleRenderType" userdata="particles" />
+					<on_check function="Client.CheckRenderType" userdata="particles" />
+				</menu_item_check>
+				<menu_item_check bottom="-270" enabled="true" height="20" hidden="false" label="Bump" left="0"
+				     mouse_opaque="true" name="Bump" shortcut="control|alt|shift|\" width="203" >
+					<on_click function="Client.ToggleRenderType" userdata="bump" />
+					<on_check function="Client.CheckRenderType" userdata="bump" />
+				</menu_item_check>
+			</menu>
+			<menu bottom="-768" drop_shadow="true" enabled="true" height="194"
+			     hidden="false" left="0" mouse_opaque="false" name="Features" opaque="true"
+			     tear_off="true" width="205">
+				<tearoff_menu bottom="-10" enabled="true" height="10" hidden="false" label="~~~~~~~~~~~"
+				     left="0" mouse_opaque="true" name="tear off" width="205" />
+				<menu_item_check bottom="-30" enabled="true" height="20" hidden="false" label="UI" left="0"
+				     mouse_opaque="true" name="UI" shortcut="control|alt|F1" width="205" >
+					<on_click function="Client.ToggleFeature" userdata="ui" />
+					<on_check function="Client.CheckFeature" userdata="ui" />
+				</menu_item_check>
+				<menu_item_check bottom="-50" enabled="true" height="20" hidden="false" label="Selected"
+				     left="0" mouse_opaque="true" name="Selected" shortcut="control|alt|F2"
+				     width="205" >
+					<on_click function="Client.ToggleFeature" userdata="selected" />
+					<on_check function="Client.CheckFeature" userdata="selected" />
+				</menu_item_check>
+				<menu_item_check bottom="-70" enabled="true" height="20" hidden="false" label="Highlighted"
+				     left="0" mouse_opaque="true" name="Highlighted" shortcut="control|alt|F3"
+				     width="205" >
+					<on_click function="Client.ToggleFeature" userdata="highlighted" />
+					<on_check function="Client.CheckFeature" userdata="highlighted" />
+				</menu_item_check>
+				<menu_item_check bottom="-90" enabled="true" height="20" hidden="false" label="Dynamic Textures"
+				     left="0" mouse_opaque="true" name="Dynamic Textures"
+				     shortcut="control|alt|F4" width="205" >
+					<on_click function="Client.ToggleFeature" userdata="dynamic textures" />
+					<on_check function="Client.CheckFeature" userdata="dynamic textures" />
+				</menu_item_check>
+				<menu_item_check bottom="-110" enabled="true" height="20" hidden="false" label="Foot Shadows"
+				     left="0" mouse_opaque="true" name="Foot Shadows" shortcut="control|alt|F5"
+				     width="205" >
+					<on_click function="Client.ToggleFeature" userdata="foot shadows" />
+					<on_check function="Client.CheckFeature" userdata="foot shadows" />
+				</menu_item_check>
+				<menu_item_check bottom="-130" enabled="true" height="20" hidden="false" label="Fog" left="0"
+				     mouse_opaque="true" name="Fog" shortcut="control|alt|F6" width="205" >
+					<on_click function="Client.ToggleFeature" userdata="fog" />
+					<on_check function="Client.CheckFeature" userdata="fog" />
+				</menu_item_check>
+				<menu_item_check bottom="-150" enabled="true" height="20" hidden="false"
+				     label="Palletized Textures" left="0" mouse_opaque="true"
+				     name="Palletized Textures" shortcut="control|alt|F7" width="205" >
+					<on_click function="Client.ToggleFeature" userdata="palette" />
+					<on_check function="Client.CheckFeature" userdata="palette" />
+				</menu_item_check>
+				<menu_item_check bottom="-170" enabled="true" height="20" hidden="false" label="Test FRInfo"
+				     left="0" mouse_opaque="true" name="Test FRInfo" shortcut="control|alt|F8"
+				     width="205" >
+					<on_click function="Client.ToggleFeature" userdata="fr info" />
+					<on_check function="Client.CheckFeature" userdata="fr info" />
+				</menu_item_check>
+				<menu_item_check bottom="-190" enabled="true" height="20" hidden="false"
+				     label="Flexible Objects" left="0" mouse_opaque="true"
+				     name="Flexible Objects" shortcut="control|alt|F9" width="205" >
+					<on_click function="Client.ToggleFeature" userdata="flexible" />
+					<on_check function="Client.CheckFeature" userdata="flexible" />
+				</menu_item_check>
+			</menu>
+			<menu bottom="-768" drop_shadow="true" enabled="true" height="374"
+			     hidden="false" left="0" mouse_opaque="false" name="Info Displays"
+			     opaque="true" tear_off="true" width="152">
+				<tearoff_menu bottom="-10" enabled="true" height="10" hidden="false" label="~~~~~~~~~~~"
+				     left="0" mouse_opaque="true" name="tear off" width="152" />
+				<menu_item_check bottom="-30" enabled="true" height="20" hidden="false" label="Verify" left="0"
+				     mouse_opaque="true" name="Verify" width="152" >
+					<on_click function="Client.ToggleInfoDisplay" userdata="verify" />
+					<on_check function="Client.CheckInfoDisplay" userdata="verify" />
+				</menu_item_check>
+				<menu_item_check bottom="-50" enabled="true" height="20" hidden="false" label="BBoxes" left="0"
+				     mouse_opaque="true" name="BBoxes" width="152" >
+					<on_click function="Client.ToggleInfoDisplay" userdata="bboxes" />
+					<on_check function="Client.CheckInfoDisplay" userdata="bboxes" />
+				</menu_item_check>
+				<menu_item_check bottom="-70" enabled="true" height="20" hidden="false" label="Points" left="0"
+				     mouse_opaque="true" name="Points" width="152" >
+					<on_click function="Client.ToggleInfoDisplay" userdata="points" />
+					<on_check function="Client.CheckInfoDisplay" userdata="points" />
+				</menu_item_check>
+				<menu_item_check bottom="-90" enabled="true" height="20" hidden="false" label="Octree" left="0"
+				     mouse_opaque="true" name="Octree" width="152" >
+					<on_click function="Client.ToggleInfoDisplay" userdata="octree" />
+					<on_check function="Client.CheckInfoDisplay" userdata="octree" />
+				</menu_item_check>
+				<menu_item_check bottom="-110" enabled="true" height="20" hidden="false" label="Occlusion"
+				     left="0" mouse_opaque="true" name="Occlusion" width="152" >
+					<on_click function="Client.ToggleInfoDisplay" userdata="occlusion" />
+					<on_check function="Client.CheckInfoDisplay" userdata="occlusion" />
+				</menu_item_check>
+				<menu_item_check bottom="-130" enabled="true" height="20" hidden="false"
+				     label="Animated Textures" left="0" mouse_opaque="true"
+				     name="Animated Textures" width="152" >
+					<on_click function="Client.ToggleInfoDisplay" userdata="texture anim" />
+					<on_check function="Client.CheckInfoDisplay" userdata="texture anim" />
+				</menu_item_check>
+				<menu_item_check bottom="-150" enabled="true" height="20" hidden="false"
+				     label="Texture Priority" left="0" mouse_opaque="true"
+				     name="Texture Priority" width="152" >
+					<on_click function="Client.ToggleInfoDisplay" userdata="texture priority" />
+					<on_check function="Client.CheckInfoDisplay" userdata="texture priority" />
+				</menu_item_check>
+				<menu_item_check bottom="-170" enabled="true" height="20" hidden="false"
+				     label="Texture Area (sqrt(A))" left="0" mouse_opaque="true"
+				     name="Texture Area (sqrt(A))" width="152" >
+					<on_click function="Client.ToggleInfoDisplay" userdata="texture area" />
+					<on_check function="Client.CheckInfoDisplay" userdata="texture area" />
+				</menu_item_check>
+				<menu_item_check bottom="-190" enabled="true" height="20" hidden="false"
+				     label="Face Area (sqrt(A))" left="0" mouse_opaque="true"
+				     name="Face Area (sqrt(A))" width="152" >
+					<on_click function="Client.ToggleInfoDisplay" userdata="face area" />
+					<on_check function="Client.CheckInfoDisplay" userdata="face area" />
+				</menu_item_check>
+				<menu_item_check bottom="-210" enabled="true" height="20" hidden="false" label="Pick Render"
+				     left="0" mouse_opaque="true" name="Pick Render" width="152" >
+					<on_click function="Client.ToggleInfoDisplay" userdata="picking" />
+					<on_check function="Client.CheckInfoDisplay" userdata="picking" />
+				</menu_item_check>
+				<menu_item_check bottom="-230" enabled="true" height="20" hidden="false" label="Particles"
+				     left="0" mouse_opaque="true" name="Particles" width="152" >
+					<on_click function="Client.ToggleInfoDisplay" userdata="particles" />
+					<on_check function="Client.CheckInfoDisplay" userdata="particles" />
+				</menu_item_check>
+				<menu_item_check bottom="-250" enabled="true" height="20" hidden="false" label="Composition"
+				     left="0" mouse_opaque="true" name="Composition" width="152" >
+					<on_click function="Client.ToggleInfoDisplay" userdata="composition" />
+					<on_check function="Client.CheckInfoDisplay" userdata="composition" />
+				</menu_item_check>
+				<menu_item_check bottom="-270" enabled="true" height="20" hidden="false" label="ShadowMap"
+				     left="0" mouse_opaque="true" name="ShadowMap" width="152" >
+					<on_click function="Client.ToggleInfoDisplay" userdata="shadow map" />
+					<on_check function="Client.CheckInfoDisplay" userdata="shadow map" />
+				</menu_item_check>
+				<menu_item_check bottom="-290" enabled="true" height="20" hidden="false" label="LightTrace"
+				     left="0" mouse_opaque="true" name="LightTrace" width="152" >
+					<on_click function="Client.ToggleInfoDisplay" userdata="light trace" />
+					<on_check function="Client.CheckInfoDisplay" userdata="light trace" />
+				</menu_item_check>
+				<menu_item_check bottom="-310" enabled="true" height="20" hidden="false" label="Glow" left="0"
+				     mouse_opaque="true" name="Glow" width="152" >
+					<on_click function="Client.ToggleInfoDisplay" userdata="glow" />
+					<on_check function="Client.CheckInfoDisplay" userdata="glow" />
+				</menu_item_check>
+				<menu_item_check bottom="-330" enabled="true" height="20" hidden="false"
+				     label="Show Depth Buffer" left="0" mouse_opaque="true"
+				     name="Show Depth Buffer" width="152" >
+					<on_click function="ToggleControl" userdata="ShowDepthBuffer" />
+					<on_check control="ShowDepthBuffer" />
+				</menu_item_check>
+				<menu_item_check bottom="-350" enabled="true" height="20" hidden="false"
+				     label="Show Select Buffer" left="0" mouse_opaque="true"
+				     name="Show Select Buffer" width="152" >
+					<on_click function="Client.ToggleSelectBuffer" userdata="" />
+					<on_check function="Client.CheckSelectBuffer" userdata="" />
+				</menu_item_check>
+				<menu_item_check bottom="-370" enabled="true" height="20" hidden="false"
+				     label="Vectorize Perf Test" left="0" mouse_opaque="true"
+				     name="Vectorize Perf Test" width="152" >
+					<on_click function="Client.ToggleVectorizePerfTest" userdata="" />
+					<on_check function="Client.CheckVectorizePerfTest" userdata="" />
+				</menu_item_check>
+			</menu>
+			<menu bottom="-768" drop_shadow="true" enabled="true" height="74"
+			     hidden="false" left="0" mouse_opaque="false" name="Render Tests"
+			     opaque="true" tear_off="true" width="153">
+				<tearoff_menu bottom="-10" enabled="true" height="10" hidden="false" label="~~~~~~~~~~~"
+				     left="0" mouse_opaque="true" name="tear off" width="153" />
+				<menu_item_check bottom="-30" enabled="true" height="20" hidden="false" label="Camera Offset"
+				     left="0" mouse_opaque="true" name="Camera Offset" width="153" >
+					<on_click function="ToggleControl" userdata="CameraOffset" />
+					<on_check control="CameraOffset" />
+				</menu_item_check>
+				<menu_item_check bottom="-50" enabled="true" height="20" hidden="false"
+				     label="Randomize Framerate" left="0" mouse_opaque="true"
+				     name="Randomize Framerate" width="153" >
+					<on_click function="Client.ToggleRandomizeFramerate" userdata="" />
+					<on_check function="Client.CheckRandomizeFramerate" userdata="" />
+				</menu_item_check>
+				<menu_item_check bottom="-70" enabled="true" height="20" hidden="false"
+				     label="Periodic Slow Frame" left="0" mouse_opaque="true"
+				     name="Periodic Slow Frame" width="153" >
+					<on_click function="Client.TogglePeriodicSlowFrame" userdata="" />
+					<on_check function="Client.CheckPeriodicSlowFrame" userdata="" />
+				</menu_item_check>
+			</menu>
+			<menu_item_separator bottom="-98" enabled="true" height="8" hidden="false" label="-----------"
+			     left="0" mouse_opaque="true" name="separator" width="246" />
+			<menu_item_check bottom="-118" enabled="true" height="20" hidden="false" label="Axes" left="0"
+			     mouse_opaque="true" name="Axes" width="246" >
+				<on_click function="ToggleControl" userdata="ShowAxes" />
+				<on_check control="ShowAxes" />
+			</menu_item_check>
+			<menu_item_separator bottom="-126" enabled="true" height="8" hidden="false" label="-----------"
+			     left="0" mouse_opaque="true" name="separator" width="246" />
+			<menu_item_check bottom="-146" enabled="true" height="20" hidden="false" label="Hide Selected"
+			     left="0" mouse_opaque="true" name="Hide Selected" width="246" >
+				<on_click function="Client.ToggleHideSelectedObjects" userdata="" />
+				<on_check function="Client.CheckHideSelectedObjects" userdata="" />
+			</menu_item_check>
+			<menu_item_separator bottom="-154" enabled="true" height="8" hidden="false" label="-----------"
+			     left="0" mouse_opaque="true" name="separator" width="246" />
+			<menu_item_check bottom="-174" enabled="true" height="20" hidden="false" label="Tangent Basis"
+			     left="0" mouse_opaque="true" name="Tangent Basis" width="246" >
+				<on_click function="ToggleControl" userdata="ShowTangentBasis" />
+				<on_check control="ShowTangentBasis" />
+			</menu_item_check>
+			<menu_item_call bottom="-194" enabled="true" height="20" hidden="false"
+			     label="Selected Texture Info" left="0" mouse_opaque="true"
+			     name="Selected Texture Info" shortcut="control|alt|shift|T" width="246" >
+				<on_click function="Client.SelectedTextureInfo" userdata="" />
+			</menu_item_call>
+			<menu_item_check bottom="-214" enabled="true" height="20" hidden="false" label="Wireframe"
+			     left="0" mouse_opaque="true" name="Wireframe" shortcut="control|shift|R"
+			     width="246" >
+				<on_click function="Client.ToggleWireframe" userdata="" />
+				<on_check function="Client.CheckWireframe" userdata="" />
+			</menu_item_check>
+			<menu_item_check bottom="-234" enabled="true" height="20" hidden="false"
+			     label="Object-Object Occlusion" left="0" mouse_opaque="true"
+			     name="Object-Object Occlusion" shortcut="control|shift|O" width="246" >
+				<on_click function="ToggleControl" userdata="UseOcclusion" />
+				<on_check control="UseOcclusion" />
+			</menu_item_check>
+			<menu_item_check bottom="-254" enabled="true" height="20" hidden="false"
+			     label="Animate Textures" left="0" mouse_opaque="true"
+			     name="Animate Textures" width="246" >
+				<on_click function="ToggleControl" userdata="AnimateTextures" />
+				<on_check control="AnimateTextures" />
+			</menu_item_check>
+			<menu_item_check bottom="-274" enabled="true" height="20" hidden="false"
+			     label="Disable Textures" left="0" mouse_opaque="true"
+			     name="Disable Textures" width="246" >
+				<on_click function="Client.ToggleDisableTextures" userdata="" />
+				<on_check function="Client.CheckDisableTextures" userdata="" />
+			</menu_item_check>
+			<menu_item_check bottom="-284" enabled="true" height="20" hidden="false"
+			     label="HTTP Get Textures" left="0" mouse_opaque="true"
+			     name="HTTP Get Textures" width="246" >
+				<on_click function="ToggleControl" userdata="ImagePipelineUseHTTP" />
+				<on_check control="ImagePipelineUseHTTP" />
+			</menu_item_check>
+			<menu_item_check bottom="-294" enabled="true" height="20" hidden="false"
+			     label="Run Multiple Threads" left="0" mouse_opaque="true"
+			     name="Run Multiple Threads" width="246" >
+				<on_click function="ToggleControl" userdata="RunMultipleThreads" />
+				<on_check control="RunMultipleThreads" />
+			</menu_item_check>
+			<menu_item_check bottom="-304" enabled="true" height="20" hidden="false" label="Dynamic Reflections"
+			     left="0" mouse_opaque="true" name="Dynamic Reflections" width="246" >
+				<on_click function="ToggleControl" userdata="RenderDynamicReflections" />
+				<on_check control="RenderDynamicReflections" />
+			</menu_item_check>
+			<menu_item_check bottom="-314" enabled="true" height="20" hidden="false" label="Cheesy Beacon"
+			     left="0" mouse_opaque="true" name="Cheesy Beacon" width="246" >
+				<on_click function="ToggleControl" userdata="CheesyBeacon" />
+				<on_check control="CheesyBeacon" />
+			</menu_item_check>
+		</menu>
+		<menu bottom="-348" drop_shadow="true" enabled="true" height="114"
+		     hidden="false" left="568" mouse_opaque="false" name="World" opaque="true"
+		     tear_off="true" width="200">
+			<tearoff_menu bottom="-10" enabled="true" height="10" hidden="false" label="~~~~~~~~~~~"
+			     left="0" mouse_opaque="true" name="tear off" width="200" />
+			<menu_item_check bottom="-30" enabled="true" height="20" hidden="false" label="Mouse Moves Sun"
+			     left="0" mouse_opaque="true" name="Mouse Moves Sun"
+			     shortcut="control|alt|M" width="200" >
+				<on_click function="ToggleControl" userdata="MouseSun" />
+				<on_check control="MouseSun" />
+			</menu_item_check>
+			<menu_item_check bottom="-50" enabled="true" height="20" hidden="false" label="Sim Sun Override"
+			     left="0" mouse_opaque="true" name="Sim Sun Override" width="200" >
+				<on_click function="ToggleControl" userdata="SkyOverrideSimSunPosition" />
+				<on_check control="SkyOverrideSimSunPosition" />
+			</menu_item_check>
+			<menu_item_call bottom="-70" enabled="true" height="20" hidden="false"
+			     label="Dump Scripted Camera" left="0" mouse_opaque="true"
+			     name="Dump Scripted Camera" width="200" >
+				<on_click function="Client.DumpScriptedCamera" userdata="" />
+			</menu_item_call>
+			<menu_item_check bottom="-90" enabled="true" height="20" hidden="false" label="Fixed Weather"
+			     left="0" mouse_opaque="true" name="Fixed Weather" width="200" >
+				<on_click function="ToggleControl" userdata="FixedWeather" />
+				<on_check control="FixedWeather" />
+			</menu_item_check>
+			<menu_item_call bottom="-110" enabled="true" height="20" hidden="false"
+			     label="Dump Region Object Cache" left="0" mouse_opaque="true"
+			     name="Dump Region Object Cache" width="200" >
+				<on_click function="Client.DumpRegionObjectCache" userdata="" />
+			</menu_item_call>
+		</menu>
+		<menu bottom="-704" drop_shadow="true" enabled="true" height="450"
+		     hidden="false" left="568" mouse_opaque="false" name="UI" opaque="true"
+		     tear_off="true" width="280">
+			<tearoff_menu bottom="-10" enabled="true" height="10" hidden="false" label="~~~~~~~~~~~"
+			     left="0" mouse_opaque="true" name="tear off" width="280" />
+			<menu_item_call bottom="-30" enabled="true" height="20" hidden="false" label="SLURL Test"
+			     left="0" mouse_opaque="true" name="SLURL Test" width="280" >
+				<on_click function="Client.SLURLTest" userdata="" />
+			</menu_item_call>
+
+			<!-- *TODO: Make this a proper toggle item with the "X" indicator.
+					 1. Add a "Client.CheckEditableUI" function in indra/newview/llviewermenu.cpp.
+					 2. Change this surrounding menu_item_call to a menu_item_check.
+					 3. Uncomment the "on_check" line below. -->
+			<menu_item_call bottom="-50" enabled="true" height="20" hidden="false" label="Editable UI"
+			     left="0" mouse_opaque="true" name="Editable UI" width="280" >
+				<on_click function="Client.ToggleEditableUI" userdata="" />
+				<!-- <on_check function="Client.CheckEditableUI" userdata="" /> -->
+			</menu_item_call>
+
+			<menu_item_check bottom="-70" enabled="true" height="20" hidden="false" label="Async Keystrokes"
+			     left="0" mouse_opaque="true" name="Async Keystrokes" width="280" >
+				<on_click function="Client.ToggleAsyncKeystrokes" userdata="" />
+				<on_check function="Client.CheckAsyncKeystrokes" userdata="" />
+			</menu_item_check>
+			<menu_item_call bottom="-90" enabled="true" height="20" hidden="false" label="Dump SelectMgr"
+			     left="0" mouse_opaque="true" name="Dump SelectMgr" width="280" >
+				<on_click function="Client.DumpSelectMgr" userdata="" />
+			</menu_item_call>
+			<menu_item_call bottom="-110" enabled="true" height="20" hidden="false" label="Dump Inventory"
+			     left="0" mouse_opaque="true" name="Dump Inventory" width="280" >
+				<on_click function="Client.DumpInventory" userdata="" />
+			</menu_item_call>
+			<menu_item_call bottom="-130" enabled="true" height="20" hidden="false"
+			     label="Dump Focus Holder" left="0" mouse_opaque="true"
+			     name="Dump Focus Holder" shortcut="control|alt|F" width="280" >
+				<on_click function="Client.DumpFocusHolder" userdata="" />
+			</menu_item_call>
+			<menu_item_call bottom="-150" enabled="true" height="20" hidden="false" label="Dump VolumeMgr"
+			     left="0" mouse_opaque="true" name="Dump VolumeMgr" width="280" >
+				<on_click function="Client.DumpVolumeMgr" userdata="" />
+			</menu_item_call>
+			<menu_item_call bottom="-170" enabled="true" height="20" hidden="false"
+			     label="Print Selected Object Info" left="0" mouse_opaque="true"
+			     name="Print Selected Object Info" shortcut="control|shift|P" width="280" >
+				<on_click function="Client.PrintSelectedObjectInfo" userdata="" />
+			</menu_item_call>
+			<menu_item_call bottom="-190" enabled="true" height="20" hidden="false"
+			     label="Print Agent Info" left="0" mouse_opaque="true"
+			     name="Print Agent Info" shortcut="shift|P" width="280" >
+				<on_click function="Client.PrintAgentInfo" userdata="" />
+			</menu_item_call>
+			<menu_item_call bottom="-210" enabled="true" height="20" hidden="false"
+			     label="Print Texture Memory Stats" left="0" mouse_opaque="true"
+			     name="Print Texture Memory Stats" shortcut="control|alt|shift|M"
+			     width="280" >
+				<on_click function="Client.PrintTextureMemoryStats" userdata="" />
+			</menu_item_call>
+			<menu_item_check bottom="-230" enabled="true" height="20" hidden="false"
+			     label="Double-Click Auto-Pilot" left="0" mouse_opaque="true"
+			     name="Double-Click Auto-Pilot" width="280" >
+				<on_click function="ToggleControl" userdata="DoubleClickAutoPilot" />
+				<on_check control="DoubleClickAutoPilot" />
+			</menu_item_check>
+			<menu_item_separator bottom="-238" enabled="true" height="8" hidden="false" label="-----------"
+			     left="0" mouse_opaque="true" name="separator" width="280" />
+			<menu_item_check bottom="-258" enabled="true" height="20" hidden="false" label="Debug SelectMgr"
+			     left="0" mouse_opaque="true" name="Debug SelectMgr" width="280" >
+				<on_click function="Client.ToggleDebugSelectMgr" userdata="" />
+				<on_check function="Client.CheckDebugSelectMgr" userdata="" />
+			</menu_item_check>
+			<menu_item_check bottom="-278" enabled="true" height="20" hidden="false" label="Debug Click"
+			     left="0" mouse_opaque="true" name="Debug Clicks" width="280" >
+				<on_click function="Client.ToggleDebugClicks" userdata="" />
+				<on_check function="Client.CheckDebugClicks" userdata="" />
+			</menu_item_check>
+			<menu_item_check bottom="-298" enabled="true" height="20" hidden="false" label="Debug Views"
+			     left="0" mouse_opaque="true" name="Debug Views" width="280" >
+				<on_click function="Client.ToggleDebugViews" userdata="" />
+				<on_check function="Client.CheckDebugViews" userdata="" />
+			</menu_item_check>
+			<menu_item_check bottom="-318" enabled="true" height="20" hidden="false"
+			     label="Show Name Tooltips" left="0" mouse_opaque="true"
+			     name="Show Name Tooltips" width="280" >
+				<on_click function="Client.ToggleNameTooltips" userdata="" />
+				<on_check function="Client.CheckNameTooltips" userdata="" />
+			</menu_item_check>
+			<menu_item_check bottom="-338" enabled="true" height="20" hidden="false"
+			     label="Debug Mouse Events" left="0" mouse_opaque="true"
+			     name="Debug Mouse Events" width="280" >
+				<on_click function="Client.ToggleDebugMouseEvents" userdata="" />
+				<on_check function="Client.CheckDebugMouseEvents" userdata="" />
+			</menu_item_check>
+			<menu_item_check bottom="-358" enabled="true" height="20" hidden="false" label="Debug Keys"
+			     left="0" mouse_opaque="true" name="Debug Keys" width="280" >
+				<on_click function="Client.ToggleDebugKeys" userdata="" />
+				<on_check function="Client.CheckDebugKeys" userdata="" />
+			</menu_item_check>
+			<menu_item_check bottom="-378" enabled="true" height="20" hidden="false"
+			     label="Debug WindowProc" left="0" mouse_opaque="true"
+			     name="Debug WindowProc" width="280" >
+				<on_click function="Client.ToggleDebugWindowProc" userdata="" />
+				<on_check function="Client.CheckDebugWindowProc" userdata="" />
+			</menu_item_check>
+			<menu_item_check bottom="-398" enabled="true" height="20" hidden="false"
+			     label="Debug Text Editor Tips" left="0" mouse_opaque="true"
+			     name="Debug Text Editor Tips" width="280" >
+				<on_click function="Client.ToggleDebugTextEditorTips" userdata="" />
+				<on_check function="Client.CheckDebugTextEditorTips" userdata="" />
+			</menu_item_check>
+			<menu_item_separator bottom="-406" enabled="true" height="8" hidden="false" label="-----------"
+			     left="0" mouse_opaque="true" name="separator" width="280" />
+			<menu_item_check bottom="-426" enabled="true" height="20" hidden="false" label="Show Time"
+			     left="0" mouse_opaque="true" name="Show Time" width="280" >
+				<on_click function="ToggleControl" userdata="DebugShowTime" />
+				<on_check control="DebugShowTime" />
+			</menu_item_check>
+			<menu_item_check bottom="-446" enabled="true" height="20" hidden="false"
+			     label="Show Render Info" left="0" mouse_opaque="true"
+			     name="Show Render Info" width="280" >
+				<on_click function="ToggleControl" userdata="DebugShowRenderInfo" />
+				<on_check control="DebugShowRenderInfo" />
+			</menu_item_check>
+		</menu>
+		<menu bottom="-408" drop_shadow="true" enabled="true" height="134"
+		     hidden="false" left="568" mouse_opaque="false" name="XUI" opaque="true"
+		     tear_off="true" width="160">
+			<tearoff_menu bottom="-10" enabled="true" height="10" hidden="false" label="~~~~~~~~~~~"
+			     left="0" mouse_opaque="true" name="tear off" width="160" />
+			<menu_item_call bottom="-30" enabled="true" height="20" hidden="false" label="Floater Test..."
+			     left="0" mouse_opaque="true" name="Floater Test..." width="160" >
+				<on_click function="Client.ShowFloaterTest" userdata="" />
+			</menu_item_call>
+			<menu_item_call bottom="-50" enabled="true" height="20" hidden="false"
+			     label="Export Menus to XML..." left="0" mouse_opaque="true"
+			     name="Export Menus to XML..." width="160" >
+				<on_click function="Client.ExportMenusToXML" userdata="" />
+			</menu_item_call>
+			<menu_item_call bottom="-70" enabled="true" height="20" hidden="false" label="Edit UI..."
+			     left="0" mouse_opaque="true" name="Edit UI..." width="160" >
+				<on_click function="Client.EditUI" userdata="" />
+			</menu_item_call>
+			<menu_item_call bottom="-90" enabled="true" height="20" hidden="false" label="Load from XML..."
+			     left="0" mouse_opaque="true" name="Load from XML..." width="160" >
+				<on_click function="Client.LoadUIFromXML" userdata="" />
+			</menu_item_call>
+			<menu_item_call bottom="-110" enabled="true" height="20" hidden="false" label="Save to XML..."
+			     left="0" mouse_opaque="true" name="Save to XML..." width="160" >
+				<on_click function="Client.SaveUIToXML" userdata="" />
+			</menu_item_call>
+			<menu_item_check bottom="-130" enabled="true" height="20" hidden="false" label="Show XUI Names"
+			     left="0" mouse_opaque="true" name="Show XUI Names" width="160" >
+				<on_click function="Client.ToggleXUINames" userdata="" />
+				<on_check function="Client.CheckXUINames" userdata="" />
+			</menu_item_check>
+		</menu>
+		<menu bottom="-768" drop_shadow="true" enabled="true" height="354"
+		     hidden="false" left="0" mouse_opaque="false" name="Character" opaque="true"
+		     tear_off="true" width="187">
+			<tearoff_menu bottom="-10" enabled="true" height="10" hidden="false" label="~~~~~~~~~~~"
+			     left="0" mouse_opaque="true" name="tear off" width="187" />
+			<menu bottom="-768" drop_shadow="true" enabled="true" height="114"
+			     hidden="false" left="0" mouse_opaque="false" name="Grab Baked Texture"
+			     opaque="true" tear_off="true" width="112">
+				<tearoff_menu bottom="-10" enabled="true" height="10" hidden="false" label="~~~~~~~~~~~"
+				     left="0" mouse_opaque="true" name="tear off" width="112" />
+				<menu_item_call bottom="-30" enabled="false" height="20" hidden="false" label="Iris" left="0"
+				     mouse_opaque="true" name="Iris" width="112" >
+					<on_click function="Client.GrabBakedTexture" userdata="eyes" />
+					<on_enable function="Client.EnableGrabBakedTexture" userdata="eyes" />
+				</menu_item_call>
+				<menu_item_call bottom="-50" enabled="false" height="20" hidden="false" label="Head" left="0"
+				     mouse_opaque="true" name="Head" width="112" >
+					<on_click function="Client.GrabBakedTexture" userdata="head" />
+					<on_enable function="Client.EnableGrabBakedTexture" userdata="head" />
+				</menu_item_call>
+				<menu_item_call bottom="-70" enabled="false" height="20" hidden="false" label="Upper Body"
+				     left="0" mouse_opaque="true" name="Upper Body" width="112" >
+					<on_click function="Client.GrabBakedTexture" userdata="upper" />
+					<on_enable function="Client.EnableGrabBakedTexture" userdata="upper" />
+				</menu_item_call>
+				<menu_item_call bottom="-90" enabled="false" height="20" hidden="false" label="Lower Body"
+				     left="0" mouse_opaque="true" name="Lower Body" width="112" >
+					<on_click function="Client.GrabBakedTexture" userdata="lower" />
+					<on_enable function="Client.EnableGrabBakedTexture" userdata="lower" />
+				</menu_item_call>
+				<menu_item_call bottom="-110" enabled="false" height="20" hidden="false" label="Skirt" left="0"
+				     mouse_opaque="true" name="Skirt" width="112" >
+					<on_click function="Client.GrabBakedTexture" userdata="skirt" />
+					<on_enable function="Client.EnableGrabBakedTexture" userdata="skirt" />
+				</menu_item_call>
+			</menu>
+			<menu bottom="-768" drop_shadow="true" enabled="true" height="154"
+			     hidden="false" left="0" mouse_opaque="false" name="Character Tests"
+			     opaque="true" tear_off="true" width="184">
+				<tearoff_menu bottom="-10" enabled="true" height="10" hidden="false" label="~~~~~~~~~~~"
+				     left="0" mouse_opaque="true" name="tear off" width="184" />
+				<menu_item_check bottom="-30" enabled="true" height="20" hidden="false"
+				     label="Go Away/AFK When Idle" left="0" mouse_opaque="true"
+				     name="Go Away/AFK When Idle" width="184" >
+					<on_click function="Client.ToggleAllowIdleAFK" userdata="" />
+					<on_check function="Client.CheckAllowIdleAFK" userdata="" />
+				</menu_item_check>
+				<menu_item_call bottom="-50" enabled="true" height="20" hidden="false"
+				     label="Appearance To XML" left="0" mouse_opaque="true"
+				     name="Appearance To XML" width="184" >
+					<on_click function="Client.ToggleAppearanceToXML" userdata="" />
+				</menu_item_call>
+				<menu_item_call bottom="-70" enabled="false" height="20" hidden="false"
+				     label="Toggle Character Geometry" left="0" mouse_opaque="true"
+				     name="Toggle Character Geometry" width="184" >
+					<on_click function="Client.ToggleCharacterGeometry" userdata="" />
+					<on_enable function="EnableGodCustomerService" userdata="" />
+				</menu_item_call>
+				<menu_item_call bottom="-90" enabled="true" height="20" hidden="false" label="Test Male"
+				     left="0" mouse_opaque="true" name="Test Male" width="184" >
+					<on_click function="Client.TestMale" userdata="" />
+				</menu_item_call>
+				<menu_item_call bottom="-110" enabled="true" height="20" hidden="false" label="Test Female"
+				     left="0" mouse_opaque="true" name="Test Female" width="184" >
+					<on_click function="Client.TestFemale" userdata="" />
+				</menu_item_call>
+				<menu_item_call bottom="-130" enabled="true" height="20" hidden="false" label="Toggle PG"
+				     left="0" mouse_opaque="true" name="Toggle PG" width="184" >					
+					<on_click function="Client.TogglePG" userdata="" />
+				</menu_item_call>
+				<menu_item_check bottom="-150" enabled="true" height="20" hidden="false"
+				     label="Allow Select Avatar" left="0" mouse_opaque="true"
+				     name="Allow Select Avatar" width="184" >
+					<on_click function="Client.ToggleAllowSelectAvatar" userdata="" />
+					<on_check function="Client.CheckAllowSelectAvatar" userdata="" />
+				</menu_item_check>
+			</menu>
+			<menu_item_call bottom="-70" enabled="true" height="20" hidden="false"
+			     label="Force Params to Default" left="0" mouse_opaque="true"
+			     name="Force Params to Default" width="187" >
+				<on_click function="Client.ForceParamsToDefault" userdata="" />
+			</menu_item_call>
+			<menu_item_call bottom="-90" enabled="true" height="20" hidden="false"
+			     label="Reload Vertex Shader" left="0" mouse_opaque="true"
+			     name="Reload Vertex Shader" width="187" >
+					<on_click function="Client.ReloadVertexShader" userdata="" />
+			</menu_item_call>
+			<menu_item_check bottom="-110" enabled="true" height="20" hidden="false" label="Animation Info"
+			     left="0" mouse_opaque="true" name="Animation Info" width="187" >
+				<on_click function="Client.ToggleAnimationInfo" userdata="" />
+				<on_check function="Client.CheckAnimationInfo" userdata="" />
+			</menu_item_check>
+
+			<!-- *TODO: Make this a proper toggle item with the "X" indicator.
+					 1. Add a "Client.CheckSlowmotionAnimation" function in indra/newview/llviewermenu.cpp.
+					 2. Change this surrounding menu_item_call to a menu_item_check.
+					 3. Uncomment the "on_check" line below. -->
+			<menu_item_call bottom="-130" enabled="true" height="20" hidden="false"
+			     label="Slow Motion Animations" left="0" mouse_opaque="true"
+			     name="Slow Motion Animations" width="187" >
+				<on_click function="Client.ToggleSlowMotionAnimations" userdata="" />
+				<!-- <on_check function="Client.CheckSlowMotionAnimations" userdata="" /> -->
+			</menu_item_call>
+
+			<menu_item_check bottom="-150" enabled="true" height="20" hidden="false" label="Show Look At"
+			     left="0" mouse_opaque="true" name="Show Look At" width="187" >
+				<on_click function="Client.ToggleShowLookAt" userdata="" />
+				<on_check function="Client.CheckShowLookAt" userdata="" />
+			</menu_item_check>
+			<menu_item_check bottom="-170" enabled="true" height="20" hidden="false" label="Show Point At"
+			     left="0" mouse_opaque="true" name="Show Point At" width="187" >
+				<on_click function="Client.ToggleShowPointAt" userdata="" />
+				<on_check function="Client.CheckShowPointAt" userdata="" />
+			</menu_item_check>
+			<menu_item_check bottom="-190" enabled="true" height="20" hidden="false"
+			     label="Debug Joint Updates" left="0" mouse_opaque="true"
+			     name="Debug Joint Updates" width="187" >
+				<on_click function="Client.ToggleDebugJointUpdates" userdata="" />
+				<on_check function="Client.CheckDebugJointUpdates" userdata="" />
+			</menu_item_check>
+			<menu_item_check bottom="-210" enabled="true" height="20" hidden="false" label="Disable LOD"
+			     left="0" mouse_opaque="true" name="Disable LOD" width="187" >
+				<on_click function="Client.ToggleDisableLOD" userdata="" />
+				<on_check function="Client.CheckDisableLOD" userdata="" />
+			</menu_item_check>
+			<menu_item_check bottom="-230" enabled="true" height="20" hidden="false"
+			     label="Debug Character Vis" left="0" mouse_opaque="true"
+			     name="Debug Character Vis" width="187" >
+				<on_click function="Client.ToggleDebugCharacterVis" userdata="" />
+				<on_check function="Client.CheckDebugCharacterVis" userdata="" />
+			</menu_item_check>
+			<menu_item_check bottom="-250" enabled="true" height="20" hidden="false"
+			     label="Show Collision Plane" left="0" mouse_opaque="true"
+			     name="Show Collision Plane" width="187" >
+				<on_click function="Client.ToggleShowCollisionPlane" userdata="" />
+				<on_check function="Client.CheckShowCollisionPlane" userdata="" />
+			</menu_item_check>
+			<menu_item_check bottom="-270" enabled="true" height="20" hidden="false"
+			     label="Show Collision Skeleton" left="0" mouse_opaque="true"
+			     name="Show Collision Skeleton" width="187" >
+				<on_click function="Client.ToggleShowCollisionSkeleton" userdata="" />
+				<on_check function="Client.CheckShowCollisionSkeleton" userdata="" />
+			</menu_item_check>
+			<menu_item_check bottom="-290" enabled="true" height="20" hidden="false"
+			     label="Display Agent Target" left="0" mouse_opaque="true"
+			     name="Display Agent Target" width="187" >
+				<on_click function="Client.ToggleDisplayAgentTarget" userdata="" />
+				<on_check function="Client.CheckDisplayAgentTarget" userdata="" />
+			</menu_item_check>
+			<menu_item_check bottom="-310" enabled="true" height="20" hidden="false" label="Debug Rotation"
+			     left="0" mouse_opaque="true" name="Debug Rotation" width="187" >
+				<on_click function="Client.ToggleDebugAvatarRotation" userdata="" />
+				<on_check function="Client.CheckDebugAvatarRotation" userdata="" />
+			</menu_item_check>
+			<menu_item_call bottom="-330" enabled="true" height="20" hidden="false"
+			     label="Dump Attachments" left="0" mouse_opaque="true"
+			     name="Dump Attachments" width="187" >
+				<on_click function="Client.DumpAttachments" userdata="" />
+			</menu_item_call>
+			<menu_item_call bottom="-350" enabled="true" height="20" hidden="false" label="Rebake Textures"
+			     left="0" mouse_opaque="true" name="Rebake Textures"
+			     shortcut="control|alt|R" width="187" >
+				<on_click function="Client.RebakeTextures" userdata="" />
+			</menu_item_call>
+		</menu>
+		<menu bottom="-768" drop_shadow="true" enabled="true" height="130"
+		     hidden="false" left="0" mouse_opaque="false" name="Network" opaque="true"
+		     tear_off="true" width="216">
+			<tearoff_menu bottom="-10" enabled="true" height="10" hidden="false" label="~~~~~~~~~~~"
+			     left="0" mouse_opaque="true" name="tear off" width="216" />
+			<menu_item_call bottom="-30" enabled="true" height="20" hidden="false"
+			     label="Enable Message Log" left="0" mouse_opaque="true"
+			     name="Enable Message Log" width="216" >
+					<on_click function="Client.EnableMessageLog" userdata="" />
+			</menu_item_call>
+			<menu_item_call bottom="-50" enabled="true" height="20" hidden="false"
+			     label="Disable Message Log" left="0" mouse_opaque="true"
+			     name="Disable Message Log" width="216" >
+					<on_click function="Client.DisableMessageLog" userdata="" />
+			</menu_item_call>
+			<menu_item_separator bottom="-58" enabled="true" height="8" hidden="false" label="-----------"
+			     left="0" mouse_opaque="true" name="separator" width="216" />
+			<menu_item_check bottom="-78" enabled="true" height="20" hidden="false"
+			     label="Velocity Interpolate Objects" left="0" mouse_opaque="true"
+			     name="Velocity Interpolate Objects" width="216" >
+				<on_click function="ToggleControl" userdata="VelocityInterpolate" />
+				<on_check control="VelocityInterpolate" />
+			</menu_item_check>
+			<menu_item_check bottom="-98" enabled="true" height="20" hidden="false"
+			     label="Ping Interpolate Object Positions" left="0" mouse_opaque="true"
+			     name="Ping Interpolate Object Positions" width="216" >
+				<on_click function="ToggleControl" userdata="PingInterpolate" />
+				<on_check control="PingInterpolate" />
+			</menu_item_check>
+			<menu_item_separator bottom="-106" enabled="true" height="8" hidden="false" label="-----------"
+			     left="0" mouse_opaque="true" name="separator" width="216" />
+			<menu_item_call bottom="-126" enabled="true" height="20" hidden="false" label="Drop a Packet"
+			     left="0" mouse_opaque="true" name="Drop a Packet" shortcut="control|alt|L"
+			     width="216" >
+				<on_click function="Client.DropPacket" userdata="" />
+			</menu_item_call>
+		</menu>
+		<menu bottom="-768" drop_shadow="true" enabled="true" height="242"
+		     hidden="false" left="0" mouse_opaque="false" name="Recorder" opaque="true"
+		     tear_off="true" width="147">
+			<tearoff_menu bottom="-10" enabled="true" height="10" hidden="false" label="~~~~~~~~~~~"
+			     left="0" mouse_opaque="true" name="tear off" width="147" />
+			<menu_item_check bottom="-30" enabled="true" height="20" hidden="false"
+			     label="Full Session Logging" left="0" mouse_opaque="true"
+			     name="Full Session Logging" width="147" >
+				<on_click function="ToggleControl" userdata="StatsSessionTrackFrameStats" />
+				<on_check control="StatsSessionTrackFrameStats" />
+			</menu_item_check>
+			<menu_item_call bottom="-50" enabled="true" height="20" hidden="false" label="Start Logging"
+			     left="0" mouse_opaque="true" name="Start Logging" width="147" >
+				<on_click function="Client.FrameStatsLogging" userdata="start logging" />
+			</menu_item_call>
+			<menu_item_call bottom="-70" enabled="true" height="20" hidden="false" label="Stop Logging"
+			     left="0" mouse_opaque="true" name="Stop Logging" width="147" >
+				<on_click function="Client.FrameStatsLogging" userdata="stop logging" />
+			</menu_item_call>
+			<menu_item_call bottom="-90" enabled="true" height="20" hidden="false" label="Log 10 Seconds"
+			     left="0" mouse_opaque="true" name="Log 10 Seconds" width="147" >
+				<on_click function="Client.FrameStatsLogging" userdata="timed logging 10" />
+			</menu_item_call>
+			<menu_item_call bottom="-110" enabled="true" height="20" hidden="false" label="Log 30 Seconds"
+			     left="0" mouse_opaque="true" name="Log 30 Seconds" width="147" >
+				<on_click function="Client.FrameStatsLogging" userdata="timed logging 30" />
+			</menu_item_call>
+			<menu_item_call bottom="-130" enabled="true" height="20" hidden="false" label="Log 60 Seconds"
+			     left="0" mouse_opaque="true" name="Log 60 Seconds" width="147" >
+				<on_click function="Client.FrameStatsLogging" userdata="timed logging 60" />
+			</menu_item_call>
+			<menu_item_separator bottom="-138" enabled="true" height="8" hidden="false" label="-----------"
+			     left="0" mouse_opaque="true" name="separator" width="147" />
+			<menu_item_call bottom="-158" enabled="true" height="20" hidden="false" label="Start Playback"
+			     left="0" mouse_opaque="true" name="Start Playback" width="147" >
+				<on_click function="Client.AgentPilot" userdata="start playback" />
+			</menu_item_call>
+			<menu_item_call bottom="-178" enabled="true" height="20" hidden="false" label="Stop Playback"
+			     left="0" mouse_opaque="true" name="Stop Playback" width="147" >
+				<on_click function="Client.AgentPilot" userdata="stop playback" />
+			</menu_item_call>
+			<menu_item_check bottom="-198" enabled="true" height="20" hidden="false" label="Loop Playback"
+			     left="0" mouse_opaque="true" name="Loop Playback" width="147" >
+				<on_click function="Client.ToggleAgentPilotLoop" userdata="" />
+				<on_check function="Client.CheckAgentPilotLoop" userdata="" />
+			</menu_item_check>
+			<menu_item_call bottom="-218" enabled="true" height="20" hidden="false" label="Start Record"
+			     left="0" mouse_opaque="true" name="Start Record" width="147" >
+				<on_click function="Client.AgentPilot" userdata="start record" />
+			</menu_item_call>
+			<menu_item_call bottom="-238" enabled="true" height="20" hidden="false" label="Stop Record"
+			     left="0" mouse_opaque="true" name="Stop Record" width="147" >
+				<on_click function="Client.AgentPilot" userdata="stop record" />
+			</menu_item_call>
+		</menu>
+		<menu_item_separator bottom="-354" enabled="true" height="8" hidden="false" label="-----------"
+		     left="0" mouse_opaque="true" name="separator" width="299" />
+		<menu_item_check bottom="-374" enabled="true" height="20" hidden="false" label="Show Updates"
+		     left="0" mouse_opaque="true" name="Show Updates"
+		     shortcut="control|alt|shift|U" width="299" >
+			<on_click function="Client.ToggleShowObjectUpdates" userdata="" />
+			<on_check function="Client.CheckShowObjectUpdates" userdata="" />
+		</menu_item_check>
+		<menu_item_separator bottom="-382" enabled="true" height="8" hidden="false" label="-----------"
+		     left="0" mouse_opaque="true" name="separator" width="299" />
+		<menu_item_call bottom="-402" enabled="true" height="20" hidden="false"
+		     label="Compress Image..." left="0" mouse_opaque="true"
+		     name="Compress Image..." width="299" >
+			<on_click function="Client.CompressImage" userdata="" />
+		</menu_item_call>
+		<menu_item_check bottom="-422" enabled="true" height="20" hidden="false"
+		     label="Limit Select Distance" left="0" mouse_opaque="true"
+		     name="Limit Select Distance" width="299" >
+			<on_click function="ToggleControl" userdata="LimitSelectDistance" />
+			<on_check control="LimitSelectDistance" />
+		</menu_item_check>
+		<menu_item_check bottom="-442" enabled="true" height="20" hidden="false"
+		     label="Disable Camera Constraints" left="0" mouse_opaque="true"
+		     name="Disable Camera Constraints" width="299" >
+			<on_click function="ToggleControl" userdata="DisableCameraConstraints" />
+			<on_check control="DisableCameraConstraints" />
+		</menu_item_check>
+		<menu_item_check bottom="-462" enabled="true" height="20" hidden="false" label="Joystick Flycam"
+		     left="0" mouse_opaque="true" name="Joystick Flycam" width="299" >
+			<on_click function="Client.ToggleJoystickFlycam" userdata="" />
+			<on_check function="Client.CheckJoystickFlycam" userdata="" />
+		</menu_item_check>
+		<menu_item_check bottom="-482" enabled="true" height="20" hidden="false" label="Mouse Smoothing"
+		     left="0" mouse_opaque="true" name="Mouse Smoothing" width="299" >
+			<on_click function="ToggleControl" userdata="MouseSmooth" />
+			<on_check control="MouseSmooth" />
+		</menu_item_check>
+		<menu_item_separator bottom="-490" enabled="true" height="8" hidden="false" label="-----------"
+		     left="0" mouse_opaque="true" name="separator" width="299" />
+		<menu_item_check bottom="-510" enabled="true" height="20" hidden="false" label="Console Window"
+		     left="0" mouse_opaque="true" name="Console Window" width="299" >
+			<on_click function="ToggleControl" userdata="ShowConsoleWindow" />
+			<on_check control="ShowConsoleWindow" />
+		</menu_item_check>
+		<menu_item_check bottom="-530" enabled="true" height="20" hidden="false" label="Clothing..."
+		     left="0" mouse_opaque="true" name="Clothing..." width="299" >
+			<on_click function="Client.ToggleClothingFloater" userdata="" />
+		</menu_item_check>
+		<menu_item_call bottom="-550" enabled="true" height="20" hidden="false" label="Debug Settings"
+		     left="0" mouse_opaque="true" name="Debug Settings" width="299" >
+			<on_click function="Client.ShowDebugSettings" userdata="" />
+		</menu_item_call>
+		<menu_item_check bottom="-570" enabled="true" height="20" hidden="false"
+		     label="View Admin Options" left="0" mouse_opaque="true"
+		     name="View Admin Options" shortcut="control|alt|V" width="299" >
+			<on_click function="Client.ToggleViewAdminOptions" userdata="" />
+			<on_check function="Client.CheckViewAdminOptions" userdata="" />
+		</menu_item_check>
+	</menu>
+
+
+
+	<menu bottom="562" drop_shadow="true" enabled="true" height="170"
+	     hidden="false" left="321" mouse_opaque="false" name="Server" opaque="true"
+	     tear_off="true" width="239">
+		<tearoff_menu bottom="-10" enabled="true" height="10" hidden="false" label="~~~~~~~~~~~"
+		     left="0" mouse_opaque="true" name="tear off" width="239" />
+		<menu bottom="-768" drop_shadow="true" enabled="true" height="134"
+		     hidden="false" left="0" mouse_opaque="false" name="Object" opaque="true"
+		     tear_off="true" width="198">
+			<tearoff_menu bottom="-10" enabled="true" height="10" hidden="false" label="~~~~~~~~~~~"
+			     left="0" mouse_opaque="true" name="tear off" width="198" />
+			<menu_item_call bottom="-30" enabled="false" height="20" hidden="false" label="Take Copy"
+			     left="0" mouse_opaque="true" name="Take Copy"
+			     shortcut="control|alt|shift|O" width="198" >
+				<on_click function="Server.ForceTakeCopy" userdata="" />
+				<on_enable function="EnableGodCustomerService" userdata="" />
+			</menu_item_call>
+			<menu_item_call bottom="-50" enabled="false" height="20" hidden="false"
+			     label="Force Owner To Me" left="0" mouse_opaque="true"
+			     name="Force Owner To Me" width="198" >
+				<on_click function="Server.ForceOwnerToMe" userdata="" />
+				<on_enable function="EnableGodCustomerService" userdata="" />
+			</menu_item_call>
+			<menu_item_call bottom="-70" enabled="false" height="20" hidden="false"
+			     label="Force Owner Permissive" left="0" mouse_opaque="true"
+			     name="Force Owner Permissive" width="198" >
+				<on_click function="Server.ForceOwnerPermissive" userdata="" />
+				<on_enable function="EnableGodCustomerService" userdata="" />
+			</menu_item_call>
+			<menu_item_call bottom="-90" enabled="false" height="20" hidden="false" label="Delete" left="0"
+			     mouse_opaque="true" name="Delete" shortcut="control|alt|shift|Del"
+			     width="198" >
+				<on_click function="Server.ForceDelete" userdata="" />
+				<on_enable function="EnableGodCustomerService" userdata="" />
+			</menu_item_call>
+			<menu_item_call bottom="-110" enabled="false" height="20" hidden="false" label="Lock" left="0"
+			     mouse_opaque="true" name="Lock" shortcut="control|alt|shift|L" width="198" >
+				<on_click function="Server.ForceLock" userdata="" />
+				<on_enable function="EnableGodCustomerService" userdata="" />
+			</menu_item_call>
+			<menu_item_call bottom="-130" enabled="false" height="20" hidden="false" label="Get Asset IDs"
+			     left="0" mouse_opaque="true" name="Get Asset IDs"
+			     shortcut="control|alt|shift|I" width="198" >
+				<on_click function="Server.GetAssetIDs" userdata="" />
+				<on_enable function="EnableGodCustomerService" userdata="" />
+			</menu_item_call>
+		</menu>
+		<menu bottom="-768" drop_shadow="true" enabled="true" height="82"
+		     hidden="false" left="0" mouse_opaque="false" name="Parcel" opaque="true"
+		     tear_off="true" width="251">
+			<tearoff_menu bottom="-10" enabled="true" height="10" hidden="false" label="~~~~~~~~~~~"
+			     left="0" mouse_opaque="true" name="tear off" width="251" />
+			<menu_item_call bottom="-30" enabled="false" height="20" hidden="false" label="Owner To Me"
+			     left="0" mouse_opaque="true" name="Owner To Me" width="251" >
+				<on_click function="Server.ForceParcelOwnerToMe" userdata="" />
+				<on_enable function="EnableGodCustomerService" userdata="" />
+			</menu_item_call>
+			<menu_item_call bottom="-50" enabled="false" height="20" hidden="false"
+			     label="Set to Linden Content" left="0" mouse_opaque="true"
+			     name="Set to Linden Content" shortcut="control|alt|shift|C" width="251" >
+				<on_click function="Server.ForceParcelLindenContent" userdata="" />
+				<on_enable function="EnableGodCustomerService" userdata="" />
+			</menu_item_call>
+			<menu_item_separator bottom="-58" enabled="true" height="8" hidden="false" label="-----------"
+			     left="0" mouse_opaque="true" name="separator" width="251" />
+			<menu_item_call bottom="-78" enabled="false" height="20" hidden="false"
+			     label="Claim Public Land" left="0" mouse_opaque="true"
+			     name="Claim Public Land" width="251" >
+				<on_click function="Server.ClaimPublicLand" userdata="" />
+				<on_enable function="EnableGodCustomerService" userdata="" />
+			</menu_item_call>
+		</menu>
+		<menu bottom="-768" drop_shadow="true" enabled="true" height="34"
+		     hidden="false" left="0" mouse_opaque="false" name="Region" opaque="true"
+		     tear_off="true" width="161">
+			<tearoff_menu bottom="-10" enabled="true" height="10" hidden="false" label="~~~~~~~~~~~"
+			     left="0" mouse_opaque="true" name="tear off" width="161" />
+			<menu_item_call bottom="-30" enabled="false" height="20" hidden="false"
+			     label="Dump Temp Asset Data" left="0" mouse_opaque="true"
+			     name="Dump Temp Asset Data" width="161" >
+				<on_click function="Server.RegionDumpTempAssetData" userdata="" />
+				<on_enable function="EnableGodCustomerService" userdata="" />
+			</menu_item_call>
+		</menu>
+		<menu_item_call bottom="-90" enabled="false" height="20" hidden="false" label="God Tools..."
+		     left="0" mouse_opaque="true" name="God Tools..." width="239" >
+			<on_click function="Server.ShowGodTools" userdata="" />
+			<on_enable function="EnableGodBasic" userdata="" />
+		</menu_item_call>
+		<menu_item_separator bottom="-98" enabled="true" height="8" hidden="false" label="-----------"
+		     left="0" mouse_opaque="true" name="separator" width="239" />
+		<menu_item_call bottom="-118" enabled="false" height="20" hidden="false"
+		     label="Save Region State" left="0" mouse_opaque="true"
+		     name="Save Region State" width="239" >
+			<on_click function="Server.SaveRegionState" userdata="" />
+			<on_enable function="EnableGodCustomerService" userdata="" />
+		</menu_item_call>
+		<menu_item_separator bottom="-126" enabled="true" height="8" hidden="false" label="-----------"
+		     left="0" mouse_opaque="true" name="separator" width="239" />
+		<menu_item_call bottom="-146" enabled="true" height="20" hidden="false"
+		     label="Request Admin Status" left="0" mouse_opaque="true"
+		     name="Request Admin Status" shortcut="control|alt|G" width="239" >
+			<on_click function="Server.RequestAdminStatus" userdata="" />
+		</menu_item_call>
+		<menu_item_call bottom="-166" enabled="true" height="20" hidden="false"
+		     label="Leave Admin Status" left="0" mouse_opaque="true"
+		     name="Leave Admin Status" shortcut="control|alt|shift|G" width="239" >
+			<on_click function="Server.LeaveAdminStatus" userdata="" />
+		</menu_item_call>
+	</menu>
+			
 </menu_bar>