2 files changed, 3517 insertions, 455 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 3e99384..ae37d96 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -750,10 +750,13 @@ void init_menus()
         gLandmarkMenu = menu;
         */
 
+        // Advanced (Client) menu is XUI now! \o/
+        /*
         menu = new LLMenuGL(CLIENT_MENU_NAME);
         init_client_menu(menu);
         gMenuBarView->appendMenu( menu );
         menu->updateParent(LLMenuGL::sMenuContainer);
+        */
 
         menu = new LLMenuGL(SERVER_MENU_NAME);
         init_server_menu(menu);
@@ -7720,6 +7723,2118 @@ class LLWorldDayCycle : public view_listener_t
 
 
 
+
+//-------------------------------------------------------------------
+// Advanced menu
+//-------------------------------------------------------------------
+
+
+///////////////////
+// SHOW CONSOLES //
+///////////////////
+
+
+class LLAdvancedToggleConsole : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLString console_type = userdata.asString();
+                if ("frame" == console_type)
+                {
+                        toggle_visibility( (void*)gDebugView->mFrameStatView );
+                }
+                else if ("texture" == console_type)
+                {
+                        toggle_visibility( (void*)gTextureView );
+                }
+                else if ("debug" == console_type)
+                {
+                        toggle_visibility( (void*)((LLView*)gDebugView->mDebugConsolep) );
+                }
+                else if ("fast timers" == console_type)
+                {
+                        toggle_visibility( (void*)gDebugView->mFastTimerView );
+                }
+                else if ("memory" == console_type)
+                {
+                        toggle_visibility( (void*)gDebugView->mMemoryView );
+                }
+                return true;
+        }
+};
+
+
+class LLAdvancedCheckConsole : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLString console_type = userdata["data"].asString();
+                bool new_value = false;
+                if ("frame" == console_type)
+                {
+                        new_value = get_visibility( (void*)gDebugView->mFrameStatView );
+                }
+                else if ("texture" == console_type)
+                {
+                        new_value = get_visibility( (void*)gTextureView );
+                }
+                else if ("debug" == console_type)
+                {
+                        new_value = get_visibility( (void*)((LLView*)gDebugView->mDebugConsolep) );
+                }
+                else if ("fast timers" == console_type)
+                {
+                        new_value = get_visibility( (void*)gDebugView->mFastTimerView );
+                }
+                else if ("memory" == console_type)
+                {
+                        new_value = get_visibility( (void*)gDebugView->mMemoryView );
+                }
+
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+//////////////////////////
+// DUMP INFO TO CONSOLE //
+//////////////////////////
+
+
+class LLAdvancedDumpInfoToConsole : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLString info_type = userdata.asString();
+                if ("region" == info_type)
+                {
+                        handle_region_dump_settings(NULL);
+                }
+                else if ("group" == info_type)
+                {
+                        handle_dump_group_info(NULL);
+                }
+                else if ("capabilities" == info_type)
+                {
+                        handle_dump_capabilities_info(NULL);
+                }
+                return true;
+        }
+};
+
+
+
+///////////////////////////////
+// RELOAD SETTINGS OVERRIDES //
+///////////////////////////////
+
+
+class LLAdvancedReloadSettingsOverrides : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                reload_personal_settings_overrides(NULL);
+                return true;
+        }
+};
+
+
+
+//////////////
+// HUD INFO //
+//////////////
+
+
+class LLAdvancedToggleHUDInfo : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLString info_type = userdata.asString();
+                if ("velocity" == info_type)
+                {
+                        toggle_visibility( (void*)gVelocityBar );
+                }
+                else if ("camera" == info_type)
+                {
+                        gDisplayCameraPos = !(gDisplayCameraPos);
+                }
+                else if ("wind" == info_type)
+                {
+                        gDisplayWindInfo = !(gDisplayWindInfo);
+                }
+                else if ("fov" == info_type)
+                {
+                        gDisplayFOV = !(gDisplayFOV);
+                }
+                return true;
+        }
+};
+
+class LLAdvancedCheckHUDInfo : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLString info_type = userdata["data"].asString();
+                bool new_value = false;
+                if ("velocity" == info_type)
+                {
+                        new_value = get_visibility( (void*)gVelocityBar );
+                }
+                else if ("camera" == info_type)
+                {
+                        new_value = gDisplayCameraPos;
+                }
+                else if ("wind" == info_type)
+                {
+                        new_value = gDisplayWindInfo;
+                }
+                else if ("fov" == info_type)
+                {
+                        new_value = gDisplayFOV;
+                }
+
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                
+                return true;
+        }
+};
+
+
+
+///////////////////////
+// CLEAR GROUP CACHE //
+///////////////////////
+
+
+class LLAdvancedClearGroupCache : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLGroupMgr::debugClearAllGroups(NULL);
+                return true;
+        }
+};
+
+
+
+
+/////////////////
+// RENDER TYPE //
+/////////////////
+
+
+U32 render_type_from_string(LLString render_type)
+{
+        if ("simple" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_SIMPLE;
+        }
+        else if ("alpha" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_ALPHA;
+        }
+        else if ("tree" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_TREE;
+        }
+        else if ("avatar" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_AVATAR;
+        }
+        else if ("terrain" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_TERRAIN;
+        }
+        else if ("sky" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_SKY;
+        }
+        else if ("water" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_WATER;
+        }
+        else if ("ground" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_GROUND;
+        }
+        else if ("volume" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_VOLUME;
+        }
+        else if ("grass" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_GRASS;
+        }
+        else if ("clouds" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_CLOUDS;
+        }
+        else if ("particles" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_PARTICLES;
+        }
+        else if ("bump" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_BUMP;
+        }
+        else
+        {
+                return 0;
+        }
+}
+
+
+class LLAdvancedToggleRenderType : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                U32 render_type = render_type_from_string( userdata.asString() );
+                if ( render_type != 0 )
+                {
+                        LLPipeline::toggleRenderTypeControl( (void*)render_type );
+                }
+                return true;
+        }
+};
+
+
+class LLAdvancedCheckRenderType : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                U32 render_type = render_type_from_string( userdata["data"].asString() );
+                bool new_value = false;
+
+                if ( render_type != 0 )
+                {
+                        new_value = LLPipeline::hasRenderTypeControl( (void*)render_type );
+                }
+                
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+/////////////
+// FEATURE //
+/////////////
+
+
+U32 feature_from_string(LLString feature)
+{
+        if ("ui" == feature)
+        {
+                return LLPipeline::RENDER_DEBUG_FEATURE_UI;
+        }
+        else if ("selected" == feature)
+        {
+                return LLPipeline::RENDER_DEBUG_FEATURE_SELECTED;
+        }
+        else if ("highlighted" == feature)
+        {
+                return LLPipeline::RENDER_DEBUG_FEATURE_HIGHLIGHTED;
+        }
+        else if ("dynamic textures" == feature)
+        {
+                return LLPipeline::RENDER_DEBUG_FEATURE_DYNAMIC_TEXTURES;
+        }
+        else if ("foot shadows" == feature)
+        {
+                return LLPipeline::RENDER_DEBUG_FEATURE_FOOT_SHADOWS;
+        }
+        else if ("fog" == feature)
+        {
+                return LLPipeline::RENDER_DEBUG_FEATURE_FOG;
+        }
+        else if ("palette" == feature)
+        {
+                return LLPipeline::RENDER_DEBUG_FEATURE_PALETTE;
+        }
+        else if ("fr info" == feature)
+        {
+                return LLPipeline::RENDER_DEBUG_FEATURE_FR_INFO;
+        }
+        else if ("flexible" == feature)
+        {
+                return LLPipeline::RENDER_DEBUG_FEATURE_FLEXIBLE;
+        }
+        else
+        {
+                return 0;
+        }
+};
+
+
+class LLAdvancedToggleFeature : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                U32 feature = feature_from_string( userdata.asString() );
+
+                if ( feature != 0 )
+                {
+                        LLPipeline::toggleRenderDebugFeature( (void*)feature );
+                }
+
+                return true;
+        }
+};
+
+
+class LLAdvancedCheckFeature : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                U32 feature = feature_from_string( userdata["data"].asString() );
+                bool new_value = false;
+
+                if ( feature != 0 )
+                {
+                        new_value = LLPipeline::toggleRenderDebugFeatureControl( (void*)feature );
+                }
+                
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+//////////////////
+// INFO DISPLAY //
+//////////////////
+
+
+U32 info_display_from_string(LLString info_display)
+{
+        if ("verify" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_VERIFY;
+        }
+        else if ("bboxes" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_BBOXES;
+        }
+        else if ("points" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_POINTS;
+        }
+        else if ("octree" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_OCTREE;
+        }
+        else if ("occlusion" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_OCCLUSION;
+        }
+        else if ("render batches" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_BATCH_SIZE;
+        }
+        else if ("texture anim" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_TEXTURE_ANIM;
+        }
+        else if ("texture priority" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY;
+        }
+        else if ("shame" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_SHAME;
+        }
+        else if ("texture area" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_TEXTURE_AREA;
+        }
+        else if ("face area" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_FACE_AREA;
+        }
+        else if ("picking" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_PICKING;
+        }
+        else if ("lights" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_LIGHTS;
+        }
+        else if ("particles" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_PARTICLES;
+        }
+        else if ("composition" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_COMPOSITION;
+        }
+        else if ("glow" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_GLOW;
+        }
+        else
+        {
+                return 0;
+        }
+};
+
+
+class LLAdvancedToggleInfoDisplay : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                U32 info_display = info_display_from_string( userdata.asString() );
+
+                if ( info_display != 0 )
+                {
+                        LLPipeline::toggleRenderDebug( (void*)info_display );
+                }
+
+                return true;
+        }
+};
+
+
+class LLAdvancedCheckInfoDisplay : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                U32 info_display = info_display_from_string( userdata["data"].asString() );
+                bool new_value = false;
+
+                if ( info_display != 0 )
+                {
+                        new_value = LLPipeline::toggleRenderDebugControl( (void*)info_display );
+                }
+                
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+///////////////////
+// SELECT BUFFER //
+///////////////////
+
+
+class LLAdvancedToggleSelectBuffer : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gDebugSelect = !(gDebugSelect);
+                return true;
+        }
+};
+
+class LLAdvancedCheckSelectBuffer : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gDebugSelect;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+/////////////////////////
+// RANDOMIZE FRAMERATE //
+/////////////////////////
+
+
+class LLAdvancedToggleRandomizeFramerate : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gRandomizeFramerate = !(gRandomizeFramerate);
+                return true;
+        }
+};
+
+class LLAdvancedCheckRandomizeFramerate : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gRandomizeFramerate;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+/////////////////////////
+// PERIODIC SLOW FRAME //
+/////////////////////////
+
+
+class LLAdvancedTogglePeriodicSlowFrame : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gPeriodicSlowFrame = !(gPeriodicSlowFrame);
+                return true;
+        }
+};
+
+class LLAdvancedCheckPeriodicSlowFrame : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gPeriodicSlowFrame;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+////////////////
+// FRAME TEST //
+////////////////
+
+
+class LLAdvancedToggleFrameTest : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLPipeline::sRenderFrameTest = !(LLPipeline::sRenderFrameTest);
+                return true;
+        }
+};
+
+class LLAdvancedCheckFrameTest : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLPipeline::sRenderFrameTest;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+///////////////////////////
+// HIDE SELECTED OBJECTS //
+///////////////////////////
+
+
+class LLAdvancedToggleHideSelectedObjects : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gHideSelectedObjects = !(gHideSelectedObjects);
+                return true;
+        }
+};
+
+class LLAdvancedCheckHideSelectedObjects : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gHideSelectedObjects;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+///////////////////////////
+// SELECTED TEXTURE INFO //
+///////////////////////////
+
+
+class LLAdvancedSelectedTextureInfo : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_selected_texture_info(NULL);
+                return true;
+        }
+};
+
+
+
+//////////////////////
+// TOGGLE WIREFRAME //
+//////////////////////
+
+
+class LLAdvancedToggleWireframe : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gUseWireframe = !(gUseWireframe);
+                return true;
+        }
+};
+
+class LLAdvancedCheckWireframe : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gUseWireframe;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+//////////////////////
+// DISABLE TEXTURES //
+//////////////////////
+
+
+class LLAdvancedToggleDisableTextures : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                menu_toggle_variable((void*)&LLViewerImage::sDontLoadVolumeTextures);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDisableTextures : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = menu_check_variable((void*)&LLViewerImage::sDontLoadVolumeTextures);
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+//////////////////////////
+// DUMP SCRIPTED CAMERA //
+//////////////////////////
+
+
+class LLAdvancedDumpScriptedCamera : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_dump_followcam(NULL);
+                return true;
+        }
+};
+
+
+
+//////////////////////////////
+// DUMP REGION OBJECT CACHE //
+//////////////////////////////
+
+
+class LLAdvancedDumpRegionObjectCache : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_dump_region_object_cache(NULL);
+                return true;
+        }
+};
+
+
+
+////////////////
+// SLURL TEST //
+////////////////
+
+
+class LLAdvancedSLURLTest : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_slurl_test(NULL);
+                return true;
+        }
+};
+
+
+
+////////////////////////
+// TOGGLE EDITABLE UI //
+////////////////////////
+
+
+class LLAdvancedToggleEditableUI : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                edit_ui(NULL);
+                return true;
+        }
+};
+
+// *TODO: Add corresponding "Check" for EditableUI, so it can
+// become a menu_item_check. Need to add check_edit_ui(void*)
+// or functional equivalent to do that.
+
+
+
+//////////////////////
+// ASYNC KEYSTROKES //
+//////////////////////
+
+
+class LLAdvancedToggleAsyncKeystrokes : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gHandleKeysAsync = !(gHandleKeysAsync);
+                return true;
+        }
+};
+
+class LLAdvancedCheckAsyncKeystrokes : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gHandleKeysAsync;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+/////////////////////
+// DUMP SELECT MGR //
+/////////////////////
+
+
+class LLAdvancedDumpSelectMgr : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                dump_select_mgr(NULL);
+                return true;
+        }
+};
+
+
+
+////////////////////
+// DUMP INVENTORY //
+////////////////////
+
+
+class LLAdvancedDumpInventory : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                dump_inventory(NULL);
+                return true;
+        }
+};
+
+
+
+///////////////////////
+// DUMP FOCUS HOLDER //
+///////////////////////
+
+
+class LLAdvancedDumpFocusHolder : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_dump_focus(NULL);
+                return true;
+        }
+};
+
+
+
+////////////////////////////////
+// PRINT SELECTED OBJECT INFO //
+////////////////////////////////
+
+
+class LLAdvancedPrintSelectedObjectInfo : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                print_object_info(NULL);
+                return true;
+        }
+};
+
+
+
+//////////////////////
+// PRINT AGENT INFO //
+//////////////////////
+
+
+class LLAdvancedPrintAgentInfo : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                print_agent_nvpairs(NULL);
+                return true;
+        }
+};
+
+
+
+////////////////////////////////
+// PRINT TEXTURE MEMORY STATS //
+////////////////////////////////
+
+
+class LLAdvancedPrintTextureMemoryStats : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                output_statistics(NULL);
+                return true;
+        }
+};
+
+
+
+//////////////////////
+// DEBUG SELECT MGR //
+//////////////////////
+
+
+class LLAdvancedToggleDebugSelectMgr : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gDebugSelectMgr = !(gDebugSelectMgr);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDebugSelectMgr : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gDebugSelectMgr;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+//////////////////
+// DEBUG CLICKS //
+//////////////////
+
+
+class LLAdvancedToggleDebugClicks : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gDebugClicks = !(gDebugClicks);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDebugClicks : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gDebugClicks;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+/////////////////
+// DEBUG VIEWS //
+/////////////////
+
+
+class LLAdvancedToggleDebugViews : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLView::sDebugRects = !(LLView::sDebugRects);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDebugViews : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLView::sDebugRects;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+///////////////////////
+// XUI NAME TOOLTIPS //
+///////////////////////
+
+
+class LLAdvancedToggleXUINameTooltips : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                toggle_show_xui_names(NULL);
+                return true;
+        }
+};
+
+class LLAdvancedCheckXUINameTooltips : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = check_show_xui_names(NULL);
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+////////////////////////
+// DEBUG MOUSE EVENTS //
+////////////////////////
+
+
+class LLAdvancedToggleDebugMouseEvents : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLView::sDebugMouseHandling = !(LLView::sDebugMouseHandling);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDebugMouseEvents : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLView::sDebugMouseHandling;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+////////////////
+// DEBUG KEYS //
+////////////////
+
+
+class LLAdvancedToggleDebugKeys : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLView::sDebugKeys = !(LLView::sDebugKeys);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDebugKeys : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLView::sDebugKeys;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+///////////////////////
+// DEBUG WINDOW PROC //
+///////////////////////
+
+
+class LLAdvancedToggleDebugWindowProc : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gDebugWindowProc = !(gDebugWindowProc);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDebugWindowProc : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gDebugWindowProc;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+////////////////////////////
+// DEBUG TEXT EDITOR TIPS //
+////////////////////////////
+
+
+class LLAdvancedToggleDebugTextEditorTips : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gDebugTextEditorTips = !(gDebugTextEditorTips);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDebugTextEditorTips : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gDebugTextEditorTips;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+///////////////////////
+// SHOW FLOATER TEST //
+///////////////////////
+
+
+class LLAdvancedShowFloaterTest : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLFloaterTest::show(NULL);
+                return true;
+        }
+};
+
+
+
+/////////////////////////
+// EXPORT MENUS TO XML //
+/////////////////////////
+
+
+class LLAdvancedExportMenusToXML : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_export_menus_to_xml(NULL);
+                return true;
+        }
+};
+
+
+
+/////////////
+// EDIT UI //
+/////////////
+
+
+class LLAdvancedEditUI : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLFloaterEditUI::show(NULL);
+                return true;
+        }
+};
+
+
+
+//////////////////////
+// LOAD UI FROM XML //
+//////////////////////
+
+
+class LLAdvancedLoadUIFromXML : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_load_from_xml(NULL);
+                return true;
+        }
+};
+
+
+
+////////////////////
+// SAVE UI TO XML //
+////////////////////
+
+
+class LLAdvancedSaveUIToXML : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_save_to_xml(NULL);
+                return true;
+        }
+};
+
+
+
+///////////////
+// XUI NAMES //
+///////////////
+
+
+class LLAdvancedToggleXUINames : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                toggle_show_xui_names(NULL);
+                return true;
+        }
+};
+
+class LLAdvancedCheckXUINames : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = check_show_xui_names(NULL);
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+////////////////////////
+// GRAB BAKED TEXTURE //
+////////////////////////
+
+
+class LLAdvancedGrabBakedTexture : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLString texture_type = userdata.asString();
+                if ("eyes" == texture_type)
+                {
+                        handle_grab_texture( (void*)LLVOAvatar::TEX_EYES_BAKED );
+                }
+                else if ("head" == texture_type)
+                {
+                        handle_grab_texture( (void*)LLVOAvatar::TEX_HEAD_BAKED );
+                }
+                else if ("upper" == texture_type)
+                {
+                        handle_grab_texture( (void*)LLVOAvatar::TEX_UPPER_BAKED );
+                }
+                else if ("lower" == texture_type)
+                {
+                        handle_grab_texture( (void*)LLVOAvatar::TEX_SKIRT_BAKED );
+                }
+                else if ("skirt" == texture_type)
+                {
+                        handle_grab_texture( (void*)LLVOAvatar::TEX_SKIRT_BAKED );
+                }
+
+                return true;
+        }
+};
+
+class LLAdvancedEnableGrabBakedTexture : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLString texture_type = userdata["data"].asString();
+                bool new_value = false;
+
+                if ("iris" == texture_type)
+                {
+                        new_value = enable_grab_texture( (void*)LLVOAvatar::TEX_EYES_BAKED );
+                }
+                else if ("head" == texture_type)
+                {
+                        new_value = enable_grab_texture( (void*)LLVOAvatar::TEX_HEAD_BAKED );
+                }
+                else if ("upper" == texture_type)
+                {
+                        new_value = enable_grab_texture( (void*)LLVOAvatar::TEX_UPPER_BAKED );
+                }
+                else if ("lower" == texture_type)
+                {
+                        new_value = enable_grab_texture( (void*)LLVOAvatar::TEX_LOWER_BAKED );
+                }
+                else if ("skirt" == texture_type)
+                {
+                        new_value = enable_grab_texture( (void*)LLVOAvatar::TEX_SKIRT_BAKED );
+                }
+                
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+//////////////////////
+// ALLOW IDLE / AFK //
+//////////////////////
+
+
+class LLAdvancedToggleAllowIdleAFK : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gAllowIdleAFK = !(gAllowIdleAFK);
+                return true;
+        }
+};
+
+class LLAdvancedCheckAllowIdleAFK : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gAllowIdleAFK;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+///////////////////////
+// APPEARANCE TO XML //
+///////////////////////
+
+
+class LLAdvancedAppearanceToXML : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLVOAvatar::dumpArchetypeXML(NULL);
+                return true;
+        }
+};
+
+
+
+///////////////////////////////
+// TOGGLE CHARACTER GEOMETRY //
+///////////////////////////////
+
+
+class LLAdvancedToggleCharacterGeometry : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_god_request_avatar_geometry(NULL);
+                return true;
+        }
+};
+
+class LLAdvancedEnableCharacterGeometry : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                enable_god_customer_service(NULL);
+                return true;
+        }
+};
+
+
+
+/////////////////////////////
+// TEST MALE / TEST FEMALE //
+/////////////////////////////
+
+
+class LLAdvancedTestMale : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_test_male(NULL);
+                return true;
+        }
+};
+
+
+class LLAdvancedTestFemale : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_test_female(NULL);
+                return true;
+        }
+};
+
+
+
+///////////////
+// TOGGLE PG //
+///////////////
+
+
+class LLAdvancedTogglePG : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_toggle_pg(NULL);
+                return true;
+        }
+};
+
+
+
+/////////////////////////
+// ALLOW SELECT AVATAR //
+/////////////////////////
+
+
+class LLAdvancedToggleAllowSelectAvatar : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gAllowSelectAvatar = !(gAllowSelectAvatar);
+                return true;
+        }
+};
+
+class LLAdvancedCheckAllowSelectAvatar : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gAllowSelectAvatar;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+////////////////////////////
+// ALLOW TAP-TAP-HOLD RUN //
+////////////////////////////
+
+
+class LLAdvancedToggleAllowTapTapHoldRun : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gAllowTapTapHoldRun = !(gAllowTapTapHoldRun);
+                return true;
+        }
+};
+
+class LLAdvancedCheckAllowTapTapHoldRun : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gAllowTapTapHoldRun;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+/////////////////////////////
+// FORCE PARAMS TO DEFAULT //
+/////////////////////////////
+
+
+class LLAdvancedForceParamsToDefault : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLAgent::clearVisualParams(NULL);
+                return true;
+        }
+};
+
+
+
+//////////////////////////
+// RELOAD VERTEX SHADER //
+//////////////////////////
+
+
+class LLAdvancedReloadVertexShader : public view_listener_t
+{
+  bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+  {
+    reload_vertex_shader(NULL);
+    return true;
+  }
+};
+
+
+
+////////////////////
+// ANIMATION INFO //
+////////////////////
+
+
+class LLAdvancedToggleAnimationInfo : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLVOAvatar::sShowAnimationDebug = !(LLVOAvatar::sShowAnimationDebug);
+                return true;
+        }
+};
+
+class LLAdvancedCheckAnimationInfo : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLVOAvatar::sShowAnimationDebug;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+////////////////////////////
+// SLOW MOTION ANIMATIONS //
+////////////////////////////
+
+
+class LLAdvancedToggleSlowMotionAnimations : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                slow_mo_animations(NULL);
+                return true;
+        }
+};
+
+// *TODO: Add a corresponding "Check" event for SlowMotionAnimations,
+// so that it can become a menu_item_check with the "X" indicator.
+// See indra/newview/skins/xui/en_us/menu_viewer.xml
+
+
+
+//////////////////
+// SHOW LOOK AT //
+//////////////////
+
+
+class LLAdvancedToggleShowLookAt : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLHUDEffectLookAt::sDebugLookAt = !(LLHUDEffectLookAt::sDebugLookAt);
+                return true;
+        }
+};
+
+class LLAdvancedCheckShowLookAt : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLHUDEffectLookAt::sDebugLookAt;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+///////////////////
+// SHOW POINT AT //
+///////////////////
+
+
+class LLAdvancedToggleShowPointAt : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLHUDEffectPointAt::sDebugPointAt = !(LLHUDEffectPointAt::sDebugPointAt);
+                return true;
+        }
+};
+
+class LLAdvancedCheckShowPointAt : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLHUDEffectPointAt::sDebugPointAt;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+/////////////////////////
+// DEBUG JOINT UPDATES //
+/////////////////////////
+
+
+class LLAdvancedToggleDebugJointUpdates : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLVOAvatar::sJointDebug = !(LLVOAvatar::sJointDebug);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDebugJointUpdates : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLVOAvatar::sJointDebug;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+/////////////////
+// DISABLE LOD //
+/////////////////
+
+
+class LLAdvancedToggleDisableLOD : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLViewerJoint::sDisableLOD = !(LLViewerJoint::sDisableLOD);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDisableLOD : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLViewerJoint::sDisableLOD;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+/////////////////////////
+// DEBUG CHARACTER VIS //
+/////////////////////////
+
+
+class LLAdvancedToggleDebugCharacterVis : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLVOAvatar::sDebugInvisible = !(LLVOAvatar::sDebugInvisible);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDebugCharacterVis : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLVOAvatar::sDebugInvisible;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+//////////////////////////
+// SHOW COLLISION PLANE //
+//////////////////////////
+
+/***************************
+ *
+ *  Disabled. See DEV-14477
+ *
+ ***************************
+
+class LLAdvancedToggleShowCollisionPlane : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLVOAvatar::sShowFootPlane = !(LLVOAvatar::sShowFootPlane);
+                return true;
+        }
+};
+
+class LLAdvancedCheckShowCollisionPlane : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLVOAvatar::sShowFootPlane;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+***************************/
+
+
+/////////////////////////////
+// SHOW COLLISION SKELETON //
+/////////////////////////////
+
+
+class LLAdvancedToggleShowCollisionSkeleton : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLVOAvatar::sShowCollisionVolumes = !(LLVOAvatar::sShowCollisionVolumes);
+                return true;
+        }
+};
+
+class LLAdvancedCheckShowCollisionSkeleton : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLVOAvatar::sShowCollisionVolumes;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+//////////////////////////
+// DISPLAY AGENT TARGET //
+//////////////////////////
+
+
+class LLAdvancedToggleDisplayAgentTarget : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLAgent::sDebugDisplayTarget = !(LLAgent::sDebugDisplayTarget);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDisplayAgentTarget : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLAgent::sDebugDisplayTarget;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+///////////////////////////
+// DEBUG AVATAR ROTATION //
+///////////////////////////
+
+
+class LLAdvancedToggleDebugAvatarRotation : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gDebugAvatarRotation = !(gDebugAvatarRotation);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDebugAvatarRotation : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gDebugAvatarRotation;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+//////////////////////
+// DUMP ATTACHMENTS //
+//////////////////////
+
+
+class LLAdvancedDumpAttachments : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_dump_attachments(NULL);
+                return true;
+        }
+};
+
+
+
+/////////////////////
+// REBAKE TEXTURES //
+/////////////////////
+
+
+class LLAdvancedRebakeTextures : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_rebake_textures(NULL);
+                return true;
+        }
+};
+
+
+
+///////////////////////////
+// DEBUG AVATAR TEXTURES //
+///////////////////////////
+
+
+class LLAdvancedDebugAvatarTextures : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_debug_avatar_textures(NULL);
+                return true;
+        }
+};
+
+
+
+////////////////////////////////
+// DUMP AVATAR LOCAL TEXTURES //
+////////////////////////////////
+
+
+class LLAdvancedDumpAvatarLocalTextures : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_dump_avatar_local_textures(NULL);
+                return true;
+        }
+};
+
+
+
+/////////////////
+// MESSAGE LOG //
+/////////////////
+
+
+class LLAdvancedEnableMessageLog : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_viewer_enable_message_log(NULL);
+                return true;
+        }
+};
+
+class LLAdvancedDisableMessageLog : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_viewer_disable_message_log(NULL);
+                return true;
+        }
+};
+
+
+
+/////////////////
+// DROP PACKET //
+/////////////////
+
+
+class LLAdvancedDropPacket : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                drop_packet(NULL);
+                return true;
+        }
+};
+
+
+
+/////////////////////////
+// FRAME STATS LOGGING //
+/////////////////////////
+
+
+class LLAdvancedFrameStatsLogging : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLString command = userdata.asString();
+                if ("start logging" == command)
+                {
+                        LLFrameStats::startLogging(NULL);
+                }
+                else if ("stop logging" == command)
+                {
+                        LLFrameStats::stopLogging(NULL);
+                }
+                else if ("timed logging 10" == command)
+                {
+                        LLFrameStats::timedLogging10(NULL);
+                }
+                else if ("timed logging 30" == command)
+                {
+                        LLFrameStats::timedLogging30(NULL);
+                }
+                else if ("timed logging 60" == command)
+                {
+                        LLFrameStats::timedLogging60(NULL);
+                }
+
+                return true;
+        }               
+};
+
+
+
+/////////////////
+// AGENT PILOT //
+/////////////////
+
+
+class LLAdvancedAgentPilot : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLString command = userdata.asString();
+                if ("start playback" == command)
+                {
+                        LLAgentPilot::startPlayback(NULL);
+                }
+                else if ("stop playback" == command)
+                {
+                        LLAgentPilot::stopPlayback(NULL);
+                }
+                else if ("start record" == command)
+                {
+                        LLAgentPilot::startRecord(NULL);
+                }
+                else if ("stop record" == command)
+                {
+                        LLAgentPilot::saveRecord(NULL);
+                }
+
+                return true;
+        }               
+};
+
+
+
+//////////////////////
+// AGENT PILOT LOOP //
+//////////////////////
+
+
+class LLAdvancedToggleAgentPilotLoop : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLAgentPilot::sLoop = !(LLAgentPilot::sLoop);
+                return true;
+        }
+};
+
+class LLAdvancedCheckAgentPilotLoop : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLAgentPilot::sLoop;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+/////////////////////////
+// SHOW OBJECT UPDATES //
+/////////////////////////
+
+
+class LLAdvancedToggleShowObjectUpdates : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gShowObjectUpdates = !(gShowObjectUpdates);
+                return true;
+        }
+};
+
+class LLAdvancedCheckShowObjectUpdates : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gShowObjectUpdates;
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+////////////////////
+// COMPRESS IMAGE //
+////////////////////
+
+
+class LLAdvancedCompressImage : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_compress_image(NULL);
+                return true;
+        }
+};
+
+
+
+//////////////////////
+// CLOTHING FLOATER //
+//////////////////////
+
+
+class LLAdvancedToggleClothingFloater : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_clothing(NULL);
+                return true;
+        }
+};
+
+// There is no LLAdvancedCheckClothingFloater.
+
+
+
+/////////////////////////
+// SHOW DEBUG SETTINGS //
+/////////////////////////
+
+
+class LLAdvancedShowDebugSettings : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLFloaterSettingsDebug::show(NULL);
+                return true;
+        }
+};
+
+
+
+////////////////////////
+// VIEW ADMIN OPTIONS //
+////////////////////////
+
+
+class LLAdvancedToggleViewAdminOptions : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_admin_override_toggle(NULL);
+                return true;
+        }
+};
+
+class LLAdvancedCheckViewAdminOptions : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = check_admin_override(NULL);
+                LLString control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+//////////////////
+// ADMIN STATUS //
+//////////////////
+
+
+class LLAdvancedRequestAdminStatus : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_god_mode(NULL);
+                return true;
+        }
+};
+
+class LLAdvancedLeaveAdminStatus : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_leave_god_mode(NULL);
+                return true;
+        }
+};
+
+
+
 static void addMenu(view_listener_t *menu, const char *name)
 {
         sMenus.push_back(menu);
@@ -7928,4 +10043,155 @@ void initialize_menus()
         addMenu(new LLSomethingSelected(), "SomethingSelected");
         addMenu(new LLSomethingSelectedNoHUD(), "SomethingSelectedNoHUD");
         addMenu(new LLEditableSelected(), "EditableSelected");
+
+
+        // Advanced (top level menu)
+        addMenu(new LLAdvancedToggleConsole(), "Advanced.ToggleConsole");
+        addMenu(new LLAdvancedCheckConsole(), "Advanced.CheckConsole");
+        addMenu(new LLAdvancedDumpInfoToConsole(), "Advanced.DumpInfoToConsole");
+        addMenu(new LLAdvancedReloadSettingsOverrides(), "Advanced.ReloadSettingsOverrides");
+
+        // Advanced > HUD Info
+        addMenu(new LLAdvancedToggleHUDInfo(), "Advanced.ToggleHUDInfo");
+        addMenu(new LLAdvancedCheckHUDInfo(), "Advanced.CheckHUDInfo");
+
+        addMenu(new LLAdvancedClearGroupCache(), "Advanced.ClearGroupCache");
+
+        // Advanced > Render > Types
+        addMenu(new LLAdvancedToggleRenderType(), "Advanced.ToggleRenderType");
+        addMenu(new LLAdvancedCheckRenderType(), "Advanced.CheckRenderType");
+
+        // Advanced > Render > Features
+        addMenu(new LLAdvancedToggleFeature(), "Advanced.ToggleFeature");
+        addMenu(new LLAdvancedCheckFeature(), "Advanced.CheckFeature");
+
+        // Advanced > Render > Info Displays
+        addMenu(new LLAdvancedToggleInfoDisplay(), "Advanced.ToggleInfoDisplay");
+        addMenu(new LLAdvancedCheckInfoDisplay(), "Advanced.CheckInfoDisplay");
+        addMenu(new LLAdvancedToggleSelectBuffer(), "Advanced.ToggleSelectBuffer");
+        addMenu(new LLAdvancedCheckSelectBuffer(), "Advanced.CheckSelectBuffer");
+        addMenu(new LLAdvancedToggleRandomizeFramerate(), "Advanced.ToggleRandomizeFramerate");
+        addMenu(new LLAdvancedCheckRandomizeFramerate(), "Advanced.CheckRandomizeFramerate");
+        addMenu(new LLAdvancedTogglePeriodicSlowFrame(), "Advanced.TogglePeriodicSlowFrame");
+        addMenu(new LLAdvancedCheckPeriodicSlowFrame(), "Advanced.CheckPeriodicSlowFrame");
+        addMenu(new LLAdvancedToggleFrameTest(), "Advanced.ToggleFrameTest");
+        addMenu(new LLAdvancedCheckFrameTest(), "Advanced.CheckFrameTest");
+        addMenu(new LLAdvancedToggleHideSelectedObjects(), "Advanced.ToggleHideSelectedObjects");
+        addMenu(new LLAdvancedCheckHideSelectedObjects(), "Advanced.CheckHideSelectedObjects");
+        addMenu(new LLAdvancedSelectedTextureInfo(), "Advanced.SelectedTextureInfo");
+        addMenu(new LLAdvancedToggleWireframe(), "Advanced.ToggleWireframe");
+        addMenu(new LLAdvancedCheckWireframe(), "Advanced.CheckWireframe");
+        addMenu(new LLAdvancedToggleDisableTextures(), "Advanced.ToggleDisableTextures");
+        addMenu(new LLAdvancedCheckDisableTextures(), "Advanced.CheckDisableTextures");
+
+        // Advanced > World
+        addMenu(new LLAdvancedDumpScriptedCamera(), "Advanced.DumpScriptedCamera");
+        addMenu(new LLAdvancedDumpRegionObjectCache(), "Advanced.DumpRegionObjectCache");
+
+        // Advanced > UI
+        addMenu(new LLAdvancedSLURLTest(), "Advanced.SLURLTest");
+        addMenu(new LLAdvancedToggleEditableUI(), "Advanced.ToggleEditableUI");
+        //addMenu(new LLAdvancedCheckEditableUI(), "Advanced.CheckEditableUI");
+        addMenu(new LLAdvancedToggleAsyncKeystrokes(), "Advanced.ToggleAsyncKeystrokes");
+        addMenu(new LLAdvancedCheckAsyncKeystrokes(), "Advanced.CheckAsyncKeystrokes");
+        addMenu(new LLAdvancedDumpSelectMgr(), "Advanced.DumpSelectMgr");
+        addMenu(new LLAdvancedDumpInventory(), "Advanced.DumpInventory");
+        addMenu(new LLAdvancedDumpFocusHolder(), "Advanced.DumpFocusHolder");
+        addMenu(new LLAdvancedPrintSelectedObjectInfo(), "Advanced.PrintSelectedObjectInfo");
+        addMenu(new LLAdvancedPrintAgentInfo(), "Advanced.PrintAgentInfo");
+        addMenu(new LLAdvancedPrintTextureMemoryStats(), "Advanced.PrintTextureMemoryStats");
+        addMenu(new LLAdvancedToggleDebugSelectMgr(), "Advanced.ToggleDebugSelectMgr");
+        addMenu(new LLAdvancedCheckDebugSelectMgr(), "Advanced.CheckDebugSelectMgr");
+        addMenu(new LLAdvancedToggleDebugClicks(), "Advanced.ToggleDebugClicks");
+        addMenu(new LLAdvancedCheckDebugClicks(), "Advanced.CheckDebugClicks");
+        addMenu(new LLAdvancedCheckDebugViews(), "Advanced.CheckDebugViews");
+        addMenu(new LLAdvancedToggleDebugViews(), "Advanced.ToggleDebugViews");
+        addMenu(new LLAdvancedToggleXUINameTooltips(), "Advanced.ToggleXUINameTooltips");
+        addMenu(new LLAdvancedCheckXUINameTooltips(), "Advanced.CheckXUINameTooltips");
+        addMenu(new LLAdvancedToggleDebugMouseEvents(), "Advanced.ToggleDebugMouseEvents");
+        addMenu(new LLAdvancedCheckDebugMouseEvents(), "Advanced.CheckDebugMouseEvents");
+        addMenu(new LLAdvancedToggleDebugKeys(), "Advanced.ToggleDebugKeys");
+        addMenu(new LLAdvancedCheckDebugKeys(), "Advanced.CheckDebugKeys");
+        addMenu(new LLAdvancedToggleDebugWindowProc(), "Advanced.ToggleDebugWindowProc");
+        addMenu(new LLAdvancedCheckDebugWindowProc(), "Advanced.CheckDebugWindowProc");
+        addMenu(new LLAdvancedToggleDebugTextEditorTips(), "Advanced.ToggleDebugTextEditorTips");
+        addMenu(new LLAdvancedCheckDebugTextEditorTips(), "Advanced.CheckDebugTextEditorTips");
+
+        // Advanced > XUI
+        addMenu(new LLAdvancedShowFloaterTest(), "Advanced.ShowFloaterTest");
+        addMenu(new LLAdvancedExportMenusToXML(), "Advanced.ExportMenusToXML");
+        addMenu(new LLAdvancedEditUI(), "Advanced.EditUI");
+        addMenu(new LLAdvancedLoadUIFromXML(), "Advanced.LoadUIFromXML");
+        addMenu(new LLAdvancedSaveUIToXML(), "Advanced.SaveUIToXML");
+        addMenu(new LLAdvancedToggleXUINames(), "Advanced.ToggleXUINames");
+        addMenu(new LLAdvancedCheckXUINames(), "Advanced.CheckXUINames");
+
+        // Advanced > Character > Grab Baked Texture
+        addMenu(new LLAdvancedGrabBakedTexture(), "Advanced.GrabBakedTexture");
+        addMenu(new LLAdvancedEnableGrabBakedTexture(), "Advanced.EnableGrabBakedTexture");
+
+        // Advanced > Character > Character Tests
+        addMenu(new LLAdvancedToggleAllowIdleAFK(), "Advanced.ToggleAllowIdleAFK");
+        addMenu(new LLAdvancedCheckAllowIdleAFK(), "Advanced.CheckAllowIdleAFK");
+        addMenu(new LLAdvancedAppearanceToXML(), "Advanced.AppearanceToXML");
+        addMenu(new LLAdvancedToggleCharacterGeometry(), "Advanced.ToggleCharacterGeometry");
+        addMenu(new LLAdvancedTestMale(), "Advanced.TestMale");
+        addMenu(new LLAdvancedTestFemale(), "Advanced.TestFemale");
+        addMenu(new LLAdvancedTogglePG(), "Advanced.TogglePG");
+        addMenu(new LLAdvancedToggleAllowSelectAvatar(), "Advanced.ToggleAllowSelectAvatar");
+        addMenu(new LLAdvancedCheckAllowSelectAvatar(), "Advanced.CheckAllowSelectAvatar");
+
+        // Advanced > Character (toplevel)
+        addMenu(new LLAdvancedToggleAllowTapTapHoldRun(), "Advanced.ToggleAllowTapTapHoldRun");
+        addMenu(new LLAdvancedCheckAllowTapTapHoldRun(), "Advanced.CheckAllowTapTapHoldRun");
+        addMenu(new LLAdvancedForceParamsToDefault(), "Advanced.ForceParamsToDefault");
+        addMenu(new LLAdvancedReloadVertexShader(), "Advanced.ReloadVertexShader");
+        addMenu(new LLAdvancedToggleAnimationInfo(), "Advanced.ToggleAnimationInfo");
+        addMenu(new LLAdvancedCheckAnimationInfo(), "Advanced.CheckAnimationInfo");
+        addMenu(new LLAdvancedToggleSlowMotionAnimations(), "Advanced.ToggleSlowMotionAnimations");
+        //addMenu(new LLAdvancedCheckSlowMotionAnimations(), "Advanced.CheckSlowMotionAnimations");
+        addMenu(new LLAdvancedToggleShowLookAt(), "Advanced.ToggleShowLookAt");
+        addMenu(new LLAdvancedCheckShowLookAt(), "Advanced.CheckShowLookAt");
+        addMenu(new LLAdvancedToggleShowPointAt(), "Advanced.ToggleShowPointAt");
+        addMenu(new LLAdvancedCheckShowPointAt(), "Advanced.CheckShowPointAt");
+        addMenu(new LLAdvancedToggleDebugJointUpdates(), "Advanced.ToggleDebugJointUpdates");
+        addMenu(new LLAdvancedCheckDebugJointUpdates(), "Advanced.CheckDebugJointUpdates");
+        addMenu(new LLAdvancedToggleDisableLOD(), "Advanced.ToggleDisableLOD");
+        addMenu(new LLAdvancedCheckDisableLOD(), "Advanced.CheckDisableLOD");
+        addMenu(new LLAdvancedToggleDebugCharacterVis(), "Advanced.ToggleDebugCharacterVis");
+        addMenu(new LLAdvancedCheckDebugCharacterVis(), "Advanced.CheckDebugCharacterVis");
+//      addMenu(new LLAdvancedToggleShowCollisionPlane(), "Advanced.ToggleShowCollisionPlane");
+//      addMenu(new LLAdvancedCheckShowCollisionPlane(), "Advanced.CheckShowCollisionPlane");
+        addMenu(new LLAdvancedToggleShowCollisionSkeleton(), "Advanced.ToggleShowCollisionSkeleton");
+        addMenu(new LLAdvancedCheckShowCollisionSkeleton(), "Advanced.CheckShowCollisionSkeleton");
+        addMenu(new LLAdvancedToggleDisplayAgentTarget(), "Advanced.ToggleDisplayAgentTarget");
+        addMenu(new LLAdvancedCheckDisplayAgentTarget(), "Advanced.CheckDisplayAgentTarget");
+        addMenu(new LLAdvancedToggleDebugAvatarRotation(), "Advanced.ToggleDebugAvatarRotation");
+        addMenu(new LLAdvancedCheckDebugAvatarRotation(), "Advanced.CheckDebugAvatarRotation");
+        addMenu(new LLAdvancedDumpAttachments(), "Advanced.DumpAttachments");
+        addMenu(new LLAdvancedRebakeTextures(), "Advanced.RebakeTextures");
+        addMenu(new LLAdvancedDebugAvatarTextures(), "Advanced.DebugAvatarTextures");
+        addMenu(new LLAdvancedDumpAvatarLocalTextures(), "Advanced.DumpAvatarLocalTextures");
+
+        // Advanced > Network
+        addMenu(new LLAdvancedEnableMessageLog(), "Advanced.EnableMessageLog");
+        addMenu(new LLAdvancedDisableMessageLog(), "Advanced.DisableMessageLog");
+        addMenu(new LLAdvancedDropPacket(), "Advanced.DropPacket");
+
+        // Advanced > Recorder
+        addMenu(new LLAdvancedFrameStatsLogging(), "Advanced.FrameStatsLogging");
+        addMenu(new LLAdvancedAgentPilot(), "Advanced.AgentPilot");
+        addMenu(new LLAdvancedToggleAgentPilotLoop(), "Advanced.ToggleAgentPilotLoop");
+        addMenu(new LLAdvancedCheckAgentPilotLoop(), "Advanced.CheckAgentPilotLoop");
+
+        // Advanced (toplevel)
+        addMenu(new LLAdvancedToggleShowObjectUpdates(), "Advanced.ToggleShowObjectUpdates");
+        addMenu(new LLAdvancedCheckShowObjectUpdates(), "Advanced.CheckShowObjectUpdates");
+        addMenu(new LLAdvancedCompressImage(), "Advanced.CompressImage");
+        addMenu(new LLAdvancedToggleClothingFloater(), "Advanced.ToggleClothingFloater");
+        addMenu(new LLAdvancedShowDebugSettings(), "Advanced.ShowDebugSettings");
+        addMenu(new LLAdvancedToggleViewAdminOptions(), "Advanced.ToggleViewAdminOptions");
+        addMenu(new LLAdvancedCheckViewAdminOptions(), "Advanced.CheckViewAdminOptions");
+        addMenu(new LLAdvancedRequestAdminStatus(), "Advanced.RequestAdminStatus");
+        addMenu(new LLAdvancedLeaveAdminStatus(), "Advanced.LeaveAdminStatus");
 }
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 92521bc..737fb56 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1,862 +1,1658 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
-     height="18" left="0" mouse_opaque="true" name="Main Menu" opaque="false"
-     tear_off="false" width="802">
-        <menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"
-             height="263" label="File" left="0" mouse_opaque="false" name="File"
-             opaque="true" tear_off="true" width="243">
-                <tearoff_menu bottom="-10" enabled="true" height="10" label="~~~~~~~~~~~" left="0"
-                     mouse_opaque="true" name="~~~~~~~~~~~" width="243" />
-                <menu_item_call bottom="-29" enabled="true" height="19" label="Upload Image (L$[COST])..."
-                     left="0" mouse_opaque="true" name="Upload Image" shortcut="control|U"
-                     width="243">
+
+<menu_bar name="Main Menu" drop_shadow="false" follows="left|top|right"
+     opaque="false" tear_off="false">
+
+
+  <!-- FILE -->
+
+        <menu name="File" create_jump_keys="true" label="File"
+             opaque="true" tear_off="true">
+                <menu_item_call name="Upload Image" label="Upload Image (L$[COST])..."
+                     shortcut="control|U">
                         <on_click function="File.UploadImage" userdata="" />
                         <on_enable function="File.EnableUpload" />
                 </menu_item_call>
-                <menu_item_call bottom="-48" enabled="true" height="19" label="Upload Sound (L$[COST])..."
-                     left="0" mouse_opaque="true" name="Upload Sound" width="243">
+                <menu_item_call name="Upload Sound" label="Upload Sound (L$[COST])...">
                         <on_click function="File.UploadSound" userdata="" />
                         <on_enable function="File.EnableUpload" />
                 </menu_item_call>
-                <menu_item_call bottom="-67" enabled="true" height="19" label="Upload Animation (L$[COST])..."
-                     left="0" mouse_opaque="true" name="Upload Animation" width="243">
+                <menu_item_call name="Upload Animation"
+                     label="Upload Animation (L$[COST])...">
                         <on_click function="File.UploadAnim" userdata="" />
                         <on_enable function="File.EnableUpload" />
                 </menu_item_call>
-                <menu_item_call bottom="-86" enabled="true" height="19"
-                     label="Bulk Upload (L$[COST] per file)..." left="0" mouse_opaque="true"
-                     name="Bulk Upload" width="243">
+                <menu_item_call name="Bulk Upload"
+                     label="Bulk Upload (L$[COST] per file)...">
                         <on_click function="File.UploadBulk" userdata="" />
                 </menu_item_call>
-                <menu_item_separator bottom="-94" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator" width="243" />
-                <menu_item_call bottom="-113" enabled="true" height="19" label="Close Window" left="0"
-                     mouse_opaque="true" name="Close Window" shortcut="control|W" width="243">
+                <menu_item_separator />
+                <menu_item_call name="Close Window" label="Close Window"
+                     shortcut="control|W">
                         <on_click function="File.CloseWindow" userdata="" />
                         <on_enable function="File.EnableCloseWindow" userdata="" />
                 </menu_item_call>
-                <menu_item_call bottom="-113" enabled="true" height="19" label="Close All Windows" left="0"
-                     mouse_opaque="true" name="Close All Windows" shortcut="control|shift|W"
-                     width="243">
+                <menu_item_call name="Close All Windows" label="Close All Windows"
+                     shortcut="control|shift|W">
                         <on_click function="File.CloseAllWindows" userdata="" />
                         <on_enable function="File.EnableCloseAllWindows" userdata="" />
                 </menu_item_call>
-                <menu_item_separator bottom="-121" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator2" width="243" />
-                <menu_item_call bottom="-140" enabled="true" height="19" label="Save Texture As..." left="0"
-                     mouse_opaque="true" name="Save Texture As..." width="243">
+                <menu_item_separator />
+                <menu_item_call name="Save Texture As..." label="Save Texture As...">
                         <on_click function="File.SaveTexture" userdata="" />
                         <on_enable function="File.EnableSaveAs" />
                 </menu_item_call>
-                <menu_item_separator bottom="-148" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator3" width="243" />
-                <menu_item_call bottom="-167" enabled="true" height="19" label="Take Snapshot" left="0"
-                     mouse_opaque="true" name="Take Snapshot" shortcut="control|shift|S"
-                     width="243">
+                <menu_item_separator />
+                <menu_item_call name="Take Snapshot" label="Take Snapshot"
+                     shortcut="control|shift|S">
                         <on_click function="File.TakeSnapshot" userdata="" />
                 </menu_item_call>
-                <menu_item_call bottom="-186" enabled="true" height="19" label="Snapshot to Disk" left="0"
-                     mouse_opaque="true" name="Snapshot to Disk" shortcut="control|`"
-                     useMacCtrl="true" width="243">
+                <menu_item_call name="Snapshot to Disk" label="Snapshot to Disk"
+                     shortcut="control|`" useMacCtrl="true">
                         <on_click function="File.TakeSnapshotToDisk" userdata="" />
                 </menu_item_call>
-                <menu_item_separator bottom="-194" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator4" width="243" />
-                <menu_item_call bottom="-259" enabled="true" height="19" label="Quit" left="0"
-                     mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">
+                <menu_item_separator />
+                <menu_item_call name="Quit" label="Quit" shortcut="control|Q">
                         <on_click function="File.Quit" userdata="" />
                 </menu_item_call>
         </menu>
-        <menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true"
-             height="439" label="Edit" left="38" mouse_opaque="false" name="Edit"
-             opaque="true" tear_off="true" width="153">
-                <menu_item_call bottom="-29" enabled="false" height="19" label="Undo" left="0"
-                     mouse_opaque="true" name="Undo" shortcut="control|Z" width="153">
+
+
+
+  <!-- EDIT -->
+
+        <menu name="Edit" create_jump_keys="true" label="Edit"
+             opaque="true" tear_off="true">
+                <menu_item_call name="Undo" enabled="false" label="Undo"
+                     shortcut="control|Z">
                         <on_click function="Edit.Undo" userdata="" />
                         <on_enable function="Edit.EnableUndo" />
                 </menu_item_call>
-                <menu_item_call bottom="-48" enabled="false" height="19" label="Redo" left="0"
-                     mouse_opaque="true" name="Redo" shortcut="control|Y" width="153">
+                <menu_item_call name="Redo" enabled="false" label="Redo"
+                     shortcut="control|Y">
                         <on_click function="Edit.Redo" userdata="" />
                         <on_enable function="Edit.EnableRedo" />
                 </menu_item_call>
-                <menu_item_separator bottom="-56" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator" width="153" />
-                <menu_item_call bottom="-75" enabled="false" height="19" label="Cut" left="0"
-                     mouse_opaque="true" name="Cut" shortcut="control|X" width="153">
+                <menu_item_separator />
+                <menu_item_call name="Cut" enabled="false" label="Cut" shortcut="control|X">
                         <on_click function="Edit.Cut" userdata="" />
                         <on_enable function="Edit.EnableCut" />
                 </menu_item_call>
-                <menu_item_call bottom="-94" enabled="false" height="19" label="Copy" left="0"
-                     mouse_opaque="true" name="Copy" shortcut="control|C" width="153">
+                <menu_item_call name="Copy" enabled="false" label="Copy"
+                     shortcut="control|C">
                         <on_click function="Edit.Copy" userdata="" />
                         <on_enable function="Edit.EnableCopy" />
                 </menu_item_call>
-                <menu_item_call bottom="-113" enabled="false" height="19" label="Paste" left="0"
-                     mouse_opaque="true" name="Paste" shortcut="control|V" width="153">
+                <menu_item_call name="Paste" enabled="false" label="Paste"
+                     shortcut="control|V">
                         <on_click function="Edit.Paste" userdata="" />
                         <on_enable function="Edit.EnablePaste" />
                 </menu_item_call>
-                <menu_item_call bottom="-132" enabled="false" height="19" label="Delete" left="0"
-                     mouse_opaque="true" name="Delete" shortcut="Del" width="153">
+                <menu_item_call name="Delete" enabled="false" label="Delete" shortcut="Del">
                         <on_click function="Edit.Delete" userdata="" />
                         <on_enable function="Edit.EnableDelete" />
                 </menu_item_call>
-                <menu_item_separator bottom="-140" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator2" width="153" />
-                <menu_item_call bottom="-159" enabled="true" height="19" label="Search..." left="0"
-                     mouse_opaque="true" name="Search..." shortcut="control|F" width="153">
+                <menu_item_separator />
+                <menu_item_call name="Search..." label="Search..." shortcut="control|F">
                         <on_click function="Edit.Search" userdata="" />
                 </menu_item_call>
-                <menu_item_separator bottom="-167" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator3" width="153" />
-                <menu_item_call bottom="-186" enabled="false" height="19" label="Select All" left="0"
-                     mouse_opaque="true" name="Select All" shortcut="control|A" width="153">
+                <menu_item_separator />
+                <menu_item_call name="Select All" enabled="false" label="Select All"
+                     shortcut="control|A">
                         <on_click function="Edit.SelectAll" userdata="" />
                         <on_enable function="Edit.EnableSelectAll" />
                 </menu_item_call>
-                <menu_item_call bottom="-205" enabled="false" height="19" label="Deselect" left="0"
-                     mouse_opaque="true" name="Deselect" shortcut="control|E" width="153">
+                <menu_item_call name="Deselect" enabled="false" label="Deselect"
+                     shortcut="control|E">
                         <on_click function="Edit.Deselect" userdata="" />
                         <on_enable function="Edit.EnableDeselect" />
                 </menu_item_call>
-                <menu_item_separator bottom="-213" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator4" width="153" />
-                <menu_item_call bottom="-232" enabled="false" height="19" label="Duplicate" left="0"
-                     mouse_opaque="true" name="Duplicate" shortcut="control|D" width="153">
+                <menu_item_separator />
+                <menu_item_call name="Duplicate" enabled="false" label="Duplicate"
+                     shortcut="control|D">
                         <on_click function="Edit.Duplicate" userdata="" />
                         <on_enable function="Edit.EnableDuplicate" />
                 </menu_item_call>
-                <menu_item_separator bottom="-240" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator5" width="153" />
-                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-                     height="554" label="Attach Object" left="0" mouse_opaque="false"
-                     name="Attach Object" opaque="true" tear_off="true" width="117" />
-                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-                     height="554" label="Detach Object" left="191" mouse_opaque="false"
-                     name="Detach Object" opaque="true" tear_off="true" width="118" />
-                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-                     height="204" label="Take Off Clothing" left="0" mouse_opaque="false"
-                     name="Take Off Clothing" opaque="true" tear_off="true" width="118">
-                        <menu_item_call bottom="-29" enabled="false" height="19" label="Shirt" left="0"
-                             mouse_opaque="true" name="Shirt" width="118">
+                <menu_item_separator />
+                <menu name="Attach Object" create_jump_keys="true" label="Attach Object"
+                     opaque="true" tear_off="true" />
+                <menu name="Detach Object" create_jump_keys="true" label="Detach Object"
+                     opaque="true" tear_off="true" />
+                <menu name="Take Off Clothing" create_jump_keys="true"
+                     label="Take Off Clothing" opaque="true" tear_off="true">
+                        <menu_item_call name="Shirt" enabled="false" label="Shirt">
                                 <on_click function="Edit.TakeOff" userdata="shirt" />
                                 <on_enable function="Edit.EnableTakeOff" userdata="shirt" />
                         </menu_item_call>
-                        <menu_item_call bottom="-48" enabled="false" height="19" label="Pants" left="0"
-                             mouse_opaque="true" name="Pants" width="118">
+                        <menu_item_call name="Pants" enabled="false" label="Pants">
                                 <on_click function="Edit.TakeOff" userdata="pants" />
                                 <on_enable function="Edit.EnableTakeOff" userdata="pants" />
                         </menu_item_call>
-                        <menu_item_call bottom="-67" enabled="false" height="19" label="Shoes" left="0"
-                             mouse_opaque="true" name="Shoes" width="118">
+                        <menu_item_call name="Shoes" enabled="false" label="Shoes">
                                 <on_click function="Edit.TakeOff" userdata="shoes" />
                                 <on_enable function="Edit.EnableTakeOff" userdata="shoes" />
                         </menu_item_call>
-                        <menu_item_call bottom="-86" enabled="false" height="19" label="Socks" left="0"
-                             mouse_opaque="true" name="Socks" width="118">
+                        <menu_item_call name="Socks" enabled="false" label="Socks">
                                 <on_click function="Edit.TakeOff" userdata="socks" />
                                 <on_enable function="Edit.EnableTakeOff" userdata="socks" />
                         </menu_item_call>
-                        <menu_item_call bottom="-105" enabled="false" height="19" label="Jacket" left="0"
-                             mouse_opaque="true" name="Jacket" width="118">
+                        <menu_item_call name="Jacket" enabled="false" label="Jacket">
                                 <on_click function="Edit.TakeOff" userdata="jacket" />
                                 <on_enable function="Edit.EnableTakeOff" userdata="jacket" />
                         </menu_item_call>
-                        <menu_item_call bottom="-124" enabled="false" height="19" label="Gloves" left="0"
-                             mouse_opaque="true" name="Gloves" width="118">
+                        <menu_item_call name="Gloves" enabled="false" label="Gloves">
                                 <on_click function="Edit.TakeOff" userdata="gloves" />
                                 <on_enable function="Edit.EnableTakeOff" userdata="gloves" />
                         </menu_item_call>
-                        <menu_item_call bottom="-143" enabled="false" height="19" label="Undershirt" left="0"
-                             mouse_opaque="true" name="Menu Undershirt" width="118">
+                        <menu_item_call name="Menu Undershirt" enabled="false" label="Undershirt">
                                 <on_click function="Edit.TakeOff" userdata="undershirt" />
                                 <on_enable function="Edit.EnableTakeOff" userdata="undershirt" />
                         </menu_item_call>
-                        <menu_item_call bottom="-162" enabled="false" height="19" label="Underpants" left="0"
-                             mouse_opaque="true" name="Menu Underpants" width="118">
+                        <menu_item_call name="Menu Underpants" enabled="false" label="Underpants">
                                 <on_click function="Edit.TakeOff" userdata="underpants" />
                                 <on_enable function="Edit.EnableTakeOff" userdata="underpants" />
                         </menu_item_call>
-                        <menu_item_call bottom="-181" enabled="false" height="19" label="Skirt" left="0"
-                             mouse_opaque="true" name="Skirt" width="118">
+                        <menu_item_call name="Skirt" enabled="false" label="Skirt">
                                 <on_click function="Edit.TakeOff" userdata="skirt" />
                                 <on_enable function="Edit.EnableTakeOff" userdata="skirt" />
                         </menu_item_call>
-                        <menu_item_call bottom="-200" enabled="true" height="19" label="All Clothes" left="0"
-                             mouse_opaque="true" name="All Clothes" width="118">
+                        <menu_item_call name="All Clothes" label="All Clothes">
                                 <on_click function="Edit.TakeOff" userdata="all" />
                         </menu_item_call>
                 </menu>
-                <menu_item_separator bottom="-305" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator6" width="153" />
-                <menu_item_call bottom="-324" enabled="true" height="19" label="Gestures..." left="0"
-                     mouse_opaque="true" name="Gestures..." shortcut="control|G" width="153">
+                <menu_item_separator />
+                <menu_item_call name="Gestures..." label="Gestures..." shortcut="control|G">
                         <on_click function="ShowFloater" userdata="gestures" />
                 </menu_item_call>
-                <menu_item_call bottom="-343" enabled="true" height="19" label="Profile..." left="0"
-                     mouse_opaque="true" name="Profile..." width="153">
+                <menu_item_call name="Profile..." label="Profile...">
                         <on_click function="ShowAgentProfile" userdata="agent" />
                 </menu_item_call>
-                <menu_item_call bottom="-362" enabled="true" height="19" label="Appearance..." left="0"
-                     mouse_opaque="true" name="Appearance..." width="153">
+                <menu_item_call name="Appearance..." label="Appearance...">
                         <on_click function="ShowFloater" userdata="appearance" />
                         <on_enable function="Edit.EnableCustomizeAvatar" />
                 </menu_item_call>
-                <menu_item_separator bottom="-370" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator7" width="153" />
-                <menu_item_check bottom="-389" enabled="true" height="19" label="Friends..." left="0"
-                     mouse_opaque="true" name="Friends..." shortcut="control|shift|F"
-                     width="153">
+                <menu_item_separator />
+                <menu_item_check name="Friends..." label="Friends..."
+                     shortcut="control|shift|F">
                         <on_click function="ShowFloater" userdata="friends" />
                         <on_check function="FloaterVisible" userdata="friends" />
                 </menu_item_check>
-                <menu_item_call bottom="-408" enabled="true" height="19" label="Groups..." left="0"
-                     mouse_opaque="true" name="Groups..." width="153">
+                <menu_item_call name="Groups..." label="Groups...">
                         <on_click function="ShowAgentGroups" userdata="agent" />
                 </menu_item_call>
-                <menu_item_separator bottom="-416" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator8" width="153" />
-                <menu_item_call bottom="-435" enabled="true" height="19" label="Preferences..." left="0"
-                     mouse_opaque="true" name="Preferences..." shortcut="control|P" width="153">
+                <menu_item_separator />
+                <menu_item_call name="Preferences..." label="Preferences..."
+                     shortcut="control|P">
                         <on_click function="ShowFloater" userdata="preferences" />
                 </menu_item_call>
         </menu>
-        <menu bottom="-1" create_jump_keys="true" drop_shadow="true" enabled="true"
-             height="537" label="View" left="80" mouse_opaque="false" name="View"
-             opaque="true" tear_off="true" width="211">
-                <tearoff_menu bottom="-10" enabled="true" height="10" label="~~~~~~~~~~~" left="0"
-                     mouse_opaque="true" name="~~~~~~~~~~~" width="211" />
-                <menu_item_call bottom="-29" enabled="true" height="19" label="Mouselook" left="0"
-                     mouse_opaque="true" name="Mouselook" shortcut="M" width="211">
+
+
+
+  <!-- VIEW -->
+
+        <menu create_jump_keys="true" label="View" name="View"
+             opaque="true" tear_off="true">
+                <menu_item_call name="Mouselook" label="Mouselook" shortcut="M">
                         <on_click function="View.Mouselook" userdata="" />
                         <on_enable function="View.EnableMouselook" />
                 </menu_item_call>
-                <menu_item_check bottom="-48" enabled="true" height="19" label="Build" left="0"
-                     mouse_opaque="true" name="Build" shortcut="B" width="211">
+                <menu_item_check name="Build" label="Build" shortcut="B">
                         <on_click function="View.BuildMode" userdata="" />
                         <on_check function="View.CheckBuildMode" />
                 </menu_item_check>
-                <menu_item_check bottom="-48" enabled="true" height="19" label="Joystick Flycam" left="0"
-                     mouse_opaque="true" name="Joystick Flycam" shortcut="alt|shift|F"
-                     width="211">
+                <menu_item_check name="Joystick Flycam" label="Joystick Flycam"
+                     shortcut="alt|shift|F">
                         <on_click function="View.JoystickFlycam" userdata="" />
                         <on_check function="View.CheckJoystickFlycam" />
                 </menu_item_check>
-                <menu_item_call bottom="-67" enabled="true" height="19" label="Reset View" left="0"
-                     mouse_opaque="true" name="Reset View" shortcut="Esc" width="211">
+                <menu_item_call name="Reset View" label="Reset View" shortcut="Esc">
                         <on_click function="View.ResetView" userdata="" />
                 </menu_item_call>
-                <menu_item_call bottom="-86" enabled="false" height="19" label="Look at Last Chatter" left="0"
-                     mouse_opaque="true" name="Look at Last Chatter" shortcut="control|\"
-                     width="211">
+                <menu_item_call name="Look at Last Chatter" enabled="false"
+                     label="Look at Last Chatter" shortcut="control|\">
                         <on_click function="View.LookAtLastChatter" userdata="" />
                         <on_enable function="View.EnableLastChatter" />
                 </menu_item_call>
-                <menu_item_separator bottom="-94" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator" width="211" />
-                <menu_item_check bottom="-113" enabled="true" height="19" label="Toolbar" left="0"
-                     mouse_opaque="true" name="Toolbar" width="211">
+                <menu_item_separator />
+                <menu_item_check name="Toolbar" label="Toolbar">
                         <on_click function="ShowFloater" userdata="toolbar" />
                         <on_check function="FloaterVisible" userdata="toolbar" />
                 </menu_item_check>
-                <menu_item_check bottom="-132" enabled="true" height="19" label="Local Chat" left="0"
-                     mouse_opaque="true" name="Chat History" shortcut="control|H" width="211">
+                <menu_item_check name="Chat History" label="Local Chat" shortcut="control|H">
                         <on_click function="ShowFloater" userdata="chat history" />
                         <on_check function="FloaterVisible" userdata="chat history" />
                 </menu_item_check>
-                <menu_item_check bottom="-151" enabled="true" height="19" label="Communicate" left="0"
-                     mouse_opaque="true" name="Instant Message" shortcut="control|T" width="211">
+                <menu_item_check name="Instant Message" label="Communicate"
+                     shortcut="control|T">
                         <on_click function="ShowFloater" userdata="im" />
                         <on_check function="FloaterVisible" userdata="im" />
                 </menu_item_check>
-                <menu_item_call bottom="-170" enabled="true" height="19" label="Inventory" left="0"
-                     mouse_opaque="true" name="Inventory" shortcut="control|I" width="211">
+                <menu_item_call name="Inventory" label="Inventory" shortcut="control|I">
                         <on_click function="ShowFloater" userdata="inventory" />
                 </menu_item_call>
-                <menu_item_check bottom="-189" enabled="true" height="19" label="Active Speakers" left="0"
-                     mouse_opaque="true" name="Active Speakers" width="211">
+                <menu_item_check name="Active Speakers" label="Active Speakers">
                         <on_click function="ShowFloater" userdata="active speakers" />
                         <on_check function="FloaterVisible" userdata="active speakers" />
                 </menu_item_check>
-                <menu_item_check bottom="-189" enabled="true" height="19" label="Mute List" left="0"
-                     mouse_opaque="true" name="Mute List" width="211">
+                <menu_item_check name="Mute List" label="Mute List">
                         <on_click function="ShowFloater" userdata="mute list" />
                         <on_check function="FloaterVisible" userdata="mute list" />
                 </menu_item_check>
-                <menu_item_separator bottom="-197" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator2" width="211" />
-                <menu_item_check bottom="-216" enabled="true" height="19" label="Camera Controls" left="0"
-                     mouse_opaque="true" name="Camera Controls" width="211">
+                <menu_item_separator />
+                <menu_item_check name="Camera Controls" label="Camera Controls">
                         <on_click function="ShowFloater" userdata="camera controls" />
                         <on_check function="FloaterVisible" userdata="camera controls" />
                 </menu_item_check>
-                <menu_item_check bottom="-235" enabled="true" height="19" label="Movement Controls" left="0"
-                     mouse_opaque="true" name="Movement Controls" width="211">
+                <menu_item_check name="Movement Controls" label="Movement Controls">
                         <on_click function="ShowFloater" userdata="movement controls" />
                         <on_check function="FloaterVisible" userdata="movement controls" />
                 </menu_item_check>
-                <menu_item_check bottom="-254" enabled="true" height="19" label="World Map" left="0"
-                     mouse_opaque="true" name="World Map" shortcut="control|M" width="211">
+                <menu_item_check name="World Map" label="World Map" shortcut="control|M">
                         <on_click function="ShowFloater" userdata="world map" />
                         <on_check control="ShowWorldMap" />
                 </menu_item_check>
-                <menu_item_check bottom="-273" enabled="true" height="19" label="Mini-Map" left="0"
-                     mouse_opaque="true" name="Mini-Map" shortcut="control|shift|M" width="211">
+                <menu_item_check name="Mini-Map" label="Mini-Map" shortcut="control|shift|M">
                         <on_click function="ShowFloater" userdata="mini map" />
                         <on_check control="ShowMiniMap" />
                 </menu_item_check>
-                <menu_item_separator bottom="-281" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator3" width="211" />
-                <menu_item_check bottom="-300" enabled="true" height="19" label="Statistics Bar" left="0"
-                     mouse_opaque="true" name="Statistics Bar" shortcut="control|shift|1"
-                     width="211">
+                <menu_item_separator />
+                <menu_item_check name="Statistics Bar" label="Statistics Bar"
+                     shortcut="control|shift|1">
                         <on_click function="ShowFloater" userdata="stat bar" />
                         <on_check function="FloaterVisible" userdata="stat bar" />
                 </menu_item_check>
-                <menu_item_check bottom="-319" enabled="true" height="19" label="Property Lines" left="0"
-                     mouse_opaque="true" name="Property Lines" shortcut="control|alt|shift|P"
-                     width="211">
+                <menu_item_check name="Property Lines" label="Property Lines"
+                     shortcut="control|alt|shift|P">
                         <on_click function="ToggleControl" userdata="ShowPropertyLines" />
                         <on_check control="ShowPropertyLines" />
                 </menu_item_check>
-                <menu_item_check bottom="-338" enabled="true" height="19" label="Land Owners" left="0"
-                     mouse_opaque="true" name="Land Owners" width="211">
+                <menu_item_check name="Land Owners" label="Land Owners">
                         <on_click function="ToggleControl" userdata="ShowParcelOwners" />
                         <on_check control="ShowParcelOwners" />
                 </menu_item_check>
-                <menu_item_separator bottom="-346" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator4" width="211" />
-                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-                     height="79" label="Hover Tips" left="0" mouse_opaque="false"
-                     name="Hover Tips" opaque="true" tear_off="true" width="158">
-                        <menu_item_check bottom="-29" enabled="true" height="19" label="Show Tips" left="0"
-                             mouse_opaque="true" name="Show Tips" shortcut="control|shift|T" width="158">
+                <menu_item_separator />
+                <menu name="Hover Tips" create_jump_keys="true" label="Hover Tips"
+                     opaque="true" tear_off="true">
+                        <menu_item_check name="Show Tips" label="Show Tips"
+                             shortcut="control|shift|T">
                                 <on_click function="View.ShowHoverTips" userdata="" />
                                 <on_check function="View.CheckShowHoverTips" />
                         </menu_item_check>
-                        <menu_item_separator bottom="-37" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator" width="158" />
-                        <menu_item_check bottom="-56" enabled="true" height="19" label="Land Tips" left="0"
-                             mouse_opaque="true" name="Land Tips" width="158">
+                        <menu_item_separator />
+                        <menu_item_check name="Land Tips" label="Land Tips">
                                 <on_click function="ToggleControl" userdata="ShowLandHoverTip" />
                                 <on_enable function="View.CheckShowHoverTips" />
                                 <on_check control="ShowLandHoverTip" />
                         </menu_item_check>
-                        <menu_item_check bottom="-75" enabled="true" height="19" label="Tips On All Objects" left="0"
-                             mouse_opaque="true" name="Tips On All Objects" width="158">
+                        <menu_item_check name="Tips On All Objects" label="Tips On All Objects">
                                 <on_click function="ToggleControl" userdata="ShowAllObjectHoverTip" />
                                 <on_enable function="View.CheckShowHoverTips" />
                                 <on_check control="ShowAllObjectHoverTip" />
                         </menu_item_check>
                 </menu>
-                <menu_item_check bottom="-403" enabled="true" height="19" label="Highlight Transparent" left="0"
-                     mouse_opaque="true" name="Highlight Transparent" shortcut="control|alt|T"
-                     width="211">
+                <menu_item_check name="Highlight Transparent" label="Highlight Transparent"
+                     shortcut="control|alt|T">
                         <on_click function="View.HighlightTransparent" userdata="" />
                         <on_check function="View.CheckHighlightTransparent" />
                 </menu_item_check>
-                <menu_item_check bottom="-384" enabled="true" height="19" label="Beacons Always On" left="0"
-                     mouse_opaque="true" name="Beacons Always On" shortcut="control|N"
-                     width="211">
+                <menu_item_check name="Beacons Always On" label="Beacons Always On"
+                     shortcut="control|N">
                         <on_click function="ToggleControl" userdata="BeaconAlwaysOn" />
                         <on_check control="BeaconAlwaysOn" />
                 </menu_item_check>
-                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-                     height="117" label="Beacons" left="0" mouse_opaque="false" name="Beacons"
-                     opaque="true" tear_off="true" width="129">
-                        <menu_item_check bottom="-29" enabled="true" height="19"
-                             label="Scripted Objects with Touch Only" left="0" mouse_opaque="true"
-                             name="Scripted Objects With Touch Only" width="129">
+                <menu name="Beacons" create_jump_keys="true" label="Beacons"
+                     opaque="true" tear_off="true">
+                        <menu_item_check name="Scripted Objects With Touch Only"
+                             label="Scripted Objects with Touch Only">
                                 <on_click function="View.ToggleBeacon" userdata="scripttouchbeacon" />
                                 <on_check function="View.CheckBeaconEnabled" userdata="scripttouchbeacon" />
                         </menu_item_check>
-                        <menu_item_check bottom="-48" enabled="true" height="19" label="Scripted Objects" left="0"
-                             mouse_opaque="true" name="Scripted Objects" width="129">
+                        <menu_item_check name="Scripted Objects" label="Scripted Objects">
                                 <on_click function="View.ToggleBeacon" userdata="scriptsbeacon" />
                                 <on_check function="View.CheckBeaconEnabled" userdata="scriptsbeacon" />
                         </menu_item_check>
-                        <menu_item_check bottom="-67" enabled="true" height="19" label="Physical Objects" left="0"
-                             mouse_opaque="true" name="Physical Objects" width="129">
+                        <menu_item_check name="Physical Objects" label="Physical Objects">
                                 <on_click function="View.ToggleBeacon" userdata="physicalbeacon" />
                                 <on_check function="View.CheckBeaconEnabled" userdata="physicalbeacon" />
                         </menu_item_check>
-                        <menu_item_check bottom="-86" enabled="true" height="19" label="Sound Sources" left="0"
-                             mouse_opaque="true" name="Sound Sources" width="129">
+                        <menu_item_check name="Sound Sources" label="Sound Sources">
                                 <on_click function="View.ToggleBeacon" userdata="soundsbeacon" />
                                 <on_check function="View.CheckBeaconEnabled" userdata="soundsbeacon" />
                         </menu_item_check>
-                        <menu_item_check bottom="-105" enabled="true" height="19" label="Particle Sources" left="0"
-                             mouse_opaque="true" name="Particle Sources" width="129">
+                        <menu_item_check name="Particle Sources" label="Particle Sources">
                                 <on_click function="View.ToggleBeacon" userdata="particlesbeacon" />
                                 <on_check function="View.CheckBeaconEnabled" userdata="particlesbeacon" />
                         </menu_item_check>
-                        <menu_item_separator bottom="-113" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator" width="129" />
-                        <menu_item_check bottom="-121" enabled="true" height="19" label="Render Highlights" left="0"
-                             mouse_opaque="true" name="Render Highlights" width="129">
+                        <menu_item_separator />
+                        <menu_item_check name="Render Highlights" label="Render Highlights">
                                 <on_click function="View.ToggleBeacon" userdata="renderhighlights" />
                                 <on_check function="View.CheckBeaconEnabled" userdata="renderhighlights" />
                         </menu_item_check>
-                        <menu_item_check bottom="-140" enabled="true" height="19" label="Render Beacons" left="0"
-                             mouse_opaque="true" name="Render Beacons" width="129">
+                        <menu_item_check name="Render Beacons" label="Render Beacons">
                                 <on_click function="View.ToggleBeacon" userdata="renderbeacons" />
                                 <on_check function="View.CheckBeaconEnabled" userdata="renderbeacons" />
                         </menu_item_check>
-                        <menu_item_separator bottom="-159" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator2" width="129" />
-                        <menu_item_check bottom="-167" enabled="true" height="19" label="Hide Particles" left="0"
-                             mouse_opaque="true" name="Hide Particles" width="129">
+                        <menu_item_separator />
+                        <menu_item_check name="Hide Particles" label="Hide Particles">
                                 <on_click function="View.ToggleRenderType" userdata="hideparticles" />
                                 <on_check function="View.CheckRenderType" userdata="hideparticles" />
                         </menu_item_check>
-                        <menu_item_separator bottom="-186" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator3" width="129" />
-                        <menu bottom="-205" color="0 0 0 1" create_jump_keys="true" drop_shadow="true"
-                             enabled="true" height="117" label="Beacon Width" left="0"
-                             mouse_opaque="false" name="Beacon Width" opaque="true" tear_off="true"
-                             width="129">
-                                <menu_item_call bottom="-19" enabled="true" height="19" label="1" left="0" mouse_opaque="true"
-                                     name="Beacon Width 1" width="188">
+                        <menu_item_separator />
+                        <menu name="Beacon Width" color="0 0 0 1" create_jump_keys="true"
+                             label="Beacon Width" opaque="true" tear_off="true">
+                                <menu_item_call name="Beacon Width 1" label="1">
                                         <on_click function="View.BeaconWidth" userdata="1" />
                                 </menu_item_call>
-                                <menu_item_call bottom="-19" enabled="true" height="19" label="4" left="0" mouse_opaque="true"
-                                     name="Beacon Width 4" width="188">
+                                <menu_item_call name="Beacon Width 4" label="4">
                                         <on_click function="View.BeaconWidth" userdata="4" />
                                 </menu_item_call>
-                                <menu_item_call bottom="-19" enabled="true" height="19" label="16" left="0" mouse_opaque="true"
-                                     name="Beacon Width 16" width="188">
+                                <menu_item_call name="Beacon Width 16" label="16">
                                         <on_click function="View.BeaconWidth" userdata="16" />
                                 </menu_item_call>
-                                <menu_item_call bottom="-19" enabled="true" height="19" label="32" left="0" mouse_opaque="true"
-                                     name="Beacon Width 32" width="188">
+                                <menu_item_call name="Beacon Width 32" label="32">
                                         <on_click function="View.BeaconWidth" userdata="32" />
                                 </menu_item_call>
                         </menu>
                 </menu>
-                <menu_item_check bottom="-441" enabled="true" height="19" label="Show HUD Attachments" left="0"
-                     mouse_opaque="true" name="Show HUD Attachments" shortcut="alt|shift|H"
-                     width="211">
+                <menu_item_check name="Show HUD Attachments" label="Show HUD Attachments"
+                     shortcut="alt|shift|H">
                         <on_click function="View.ShowHUDAttachments" userdata="" />
                         <on_check function="View.CheckHUDAttachments" />
                 </menu_item_check>
-                <menu_item_separator bottom="-449" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator5" width="211" />
-                <menu_item_call bottom="-468" enabled="true" height="19" label="Zoom In" left="0"
-                     mouse_opaque="true" name="Zoom In" shortcut="control|0" width="211">
+                <menu_item_separator />
+                <menu_item_call name="Zoom In" label="Zoom In" shortcut="control|0">
                         <on_click function="View.ZoomIn" userdata="" />
                 </menu_item_call>
-                <menu_item_call bottom="-487" enabled="true" height="19" label="Zoom Default" left="0"
-                     mouse_opaque="true" name="Zoom Default" shortcut="control|9" width="211">
+                <menu_item_call name="Zoom Default" label="Zoom Default"
+                     shortcut="control|9">
                         <on_click function="View.ZoomDefault" userdata="" />
                 </menu_item_call>
-                <menu_item_call bottom="-506" enabled="true" height="19" label="Zoom Out" left="0"
-                     mouse_opaque="true" name="Zoom Out" shortcut="control|8" width="211">
+                <menu_item_call name="Zoom Out" label="Zoom Out" shortcut="control|8">
                         <on_click function="View.ZoomOut" userdata="" />
                 </menu_item_call>
-                <menu_item_separator bottom="-514" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator6" width="211" />
-                <menu_item_call bottom="-19" enabled="true" height="19" label="Toggle Fullscreen" left="0"
-                     mouse_opaque="true" name="Toggle Fullscreen" shortcut="alt|Enter"
-                     width="188">
+                <menu_item_separator />
+                <menu_item_call name="Toggle Fullscreen" label="Toggle Fullscreen"
+                     shortcut="alt|Enter">
                         <on_click function="View.Fullscreen" userdata="" />
                 </menu_item_call>
-                <menu_item_call bottom="-38" enabled="true" height="19" label="Set UI Size to Default" left="0"
-                     mouse_opaque="true" name="Set UI Size to Default" width="188">
+                <menu_item_call name="Set UI Size to Default" label="Set UI Size to Default">
                         <on_click function="View.DefaultUISize" userdata="" />
                 </menu_item_call>
         </menu>
-        <menu bottom="-18" create_jump_keys="true" drop_shadow="true" enabled="true"
-             height="339" label="World" left="0" mouse_opaque="false" name="World"
-             opaque="true" tear_off="true" width="185">
-                <menu_item_call bottom="-29" enabled="true" height="19" label="Chat" left="0"
-                     mouse_opaque="true" name="Chat" shortcut="" width="185">
+
+
+
+  <!-- WORLD -->
+
+        <menu name="World" create_jump_keys="true" label="World"
+             opaque="true" tear_off="true">
+                <menu_item_call name="Chat" label="Chat" shortcut="">
                         <on_click function="World.Chat" userdata="" />
                 </menu_item_call>
-                <menu_item_check bottom="-67" enabled="true" height="19" label="Always Run" left="0"
-                     mouse_opaque="true" name="Always Run" shortcut="control|R" width="185">
+                <menu_item_check name="Always Run" label="Always Run" shortcut="control|R">
                         <on_click function="World.AlwaysRun" userdata="" />
                         <on_check function="World.CheckAlwaysRun" userdata="" />
                 </menu_item_check>
-                <menu_item_check bottom="-86" enabled="true" height="19" label="Fly" left="0"
-                     mouse_opaque="true" name="Fly" shortcut="Home" width="185">
+                <menu_item_check name="Fly" label="Fly" shortcut="Home">
                         <on_click function="World.Fly" userdata="" />
                         <on_enable function="World.EnableFly" />
                         <on_check control="FlyBtnState" />
                 </menu_item_check>
-                <menu_item_separator bottom="-94" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator" width="185" />
-                <menu_item_call bottom="-113" enabled="true" height="19" label="Create Landmark Here" left="0"
-                     mouse_opaque="true" name="Create Landmark Here" width="185">
+                <menu_item_separator />
+                <menu_item_call name="Create Landmark Here" label="Create Landmark Here">
                         <on_click function="World.CreateLandmark" userdata="" />
                         <on_enable function="World.EnableCreateLandmark" userdata="" />
                 </menu_item_call>
-                <menu_item_call bottom="-132" enabled="true" height="19" label="Set Home to Here" left="0"
-                     mouse_opaque="true" name="Set Home to Here" width="185">
+                <menu_item_call name="Set Home to Here" label="Set Home to Here">
                         <on_click function="World.SetHomeLocation" userdata="" />
                         <on_enable function="World.EnableSetHomeLocation" userdata="" />
                 </menu_item_call>
-                <menu_item_separator bottom="-140" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator2" width="185" />
-                <menu_item_call bottom="-159" enabled="true" height="19" label="Teleport Home" left="0"
-                     mouse_opaque="true" name="Teleport Home" shortcut="control|shift|H"
-                     width="185">
+                <menu_item_separator />
+                <menu_item_call name="Teleport Home" label="Teleport Home"
+                     shortcut="control|shift|H">
                         <on_click function="World.TeleportHome" userdata="" />
                         <on_enable function="World.EnableTeleportHome" userdata="" />
                 </menu_item_call>
-                <menu_item_separator bottom="-167" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator3" width="185" />
-                <menu_item_call bottom="-186" enabled="true" height="19" label="Set Away" left="0"
-                     mouse_opaque="true" name="Set Away" width="185">
+                <menu_item_separator />
+                <menu_item_call name="Set Away" label="Set Away">
                         <on_click function="World.SetAway" userdata="" />
                 </menu_item_call>
-                <menu_item_call bottom="-205" enabled="true" height="19" label="Set Busy" left="0"
-                     mouse_opaque="true" name="Set Busy" width="185">
+                <menu_item_call name="Set Busy" label="Set Busy">
                         <on_click function="World.SetBusy" userdata="" />
                 </menu_item_call>
-                <menu_item_call bottom="-281" enabled="false" height="19" label="Stop All Animations" left="0"
-                     mouse_opaque="true" name="Stop All Animations" width="250">
+                <menu_item_call name="Stop All Animations" enabled="false"
+                     label="Stop All Animations">
                         <on_click function="Tools.StopAllAnimations" userdata="" />
                 </menu_item_call>
-                <menu_item_separator bottom="-213" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator4" width="185" />
-                <menu_item_call bottom="-232" enabled="true" height="19" label="Account History..." left="0"
-                     mouse_opaque="true" name="Account History..." width="185">
+                <menu_item_separator />
+                <menu_item_call name="Account History..." label="Account History...">
                         <on_click function="PromptShowURL"
                              userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php" />
                 </menu_item_call>
-                <menu_item_call bottom="-267" enabled="true" height="19" label="Manage My Account..." left="0"
-                     mouse_opaque="true" name="Manage My Account..." width="166">
+                <menu_item_call name="Manage My Account..." label="Manage My Account...">
                         <on_click function="PromptShowURL"
                              userdata="WebLaunchJoinNow,http://secondlife.com/account/" />
                 </menu_item_call>
-                <menu_item_call bottom="-286" enabled="true" height="19" label="Buy L$..." left="0"
-                     mouse_opaque="true" name="Buy and Sell L$..." width="166">
+                <menu_item_call name="Buy and Sell L$..." label="Buy L$...">
                         <on_click function="ShowFloater" userdata="buy currency" />
                 </menu_item_call>
-                <menu_item_separator bottom="-213" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator5" width="185" />
-                <menu_item_call bottom="-251" enabled="true" height="19" label="My Land..." left="0"
-                     mouse_opaque="true" name="My Land..." width="185">
+                <menu_item_separator />
+                <menu_item_call name="My Land..." label="My Land...">
                         <on_click function="ShowFloater" userdata="my land" />
                 </menu_item_call>
-                <menu_item_call bottom="-270" enabled="true" height="19" label="About Land..." left="0"
-                     mouse_opaque="true" name="About Land..." width="185">
+                <menu_item_call name="About Land..." label="About Land...">
                         <on_click function="ShowFloater" userdata="about land" />
                 </menu_item_call>
-                <menu_item_call bottom="-289" enabled="true" height="19" label="Buy Land..." left="0"
-                     mouse_opaque="true" name="Buy Land..." width="185">
+                <menu_item_call name="Buy Land..." label="Buy Land...">
                         <on_click function="ShowFloater" userdata="buy land" />
                         <on_enable function="World.EnableBuyLand" />
                 </menu_item_call>
-                <menu_item_call bottom="-308" enabled="true" height="19" label="Region/Estate..." left="0"
-                     mouse_opaque="true" name="Region/Estate..." width="185">
+                <menu_item_call name="Region/Estate..." label="Region/Estate...">
                         <on_click function="ShowFloater" userdata="about region" />
                 </menu_item_call>
-                <menu_item_separator bottom="-316" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator6" width="185" />
-                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-                     height="117" label="Environment Settings" left="0" mouse_opaque="false"
-                     name="Environment Settings" opaque="true" tear_off="true" width="169">
-                        <menu_item_call bottom="-29" enabled="true" height="19" label="Sunrise" left="0"
-                             mouse_opaque="true" name="Sunrise" width="169">
+                <menu_item_separator />
+                <menu name="Environment Settings" create_jump_keys="true"
+                     label="Environment Settings" opaque="true" tear_off="true">
+                        <menu_item_call name="Sunrise" label="Sunrise">
                                 <on_click function="World.EnvSettings" userdata="sunrise" />
                         </menu_item_call>
-                        <menu_item_call bottom="-48" enabled="true" height="19" label="Midday" left="0"
-                             mouse_opaque="true" name="Noon" shortcut="control|shift|Y" width="169">
+                        <menu_item_call name="Noon" label="Midday" shortcut="control|shift|Y">
                                 <on_click function="World.EnvSettings" userdata="noon" />
                         </menu_item_call>
-                        <menu_item_call bottom="-67" enabled="true" height="19" label="Sunset" left="0"
-                             mouse_opaque="true" name="Sunset" shortcut="control|shift|N" width="169">
+                        <menu_item_call name="Sunset" label="Sunset" shortcut="control|shift|N">
                                 <on_click function="World.EnvSettings" userdata="sunset" />
                         </menu_item_call>
-                        <menu_item_call bottom="-86" enabled="true" height="19" label="Midnight" left="0"
-                             mouse_opaque="true" name="Midnight" width="169">
+                        <menu_item_call name="Midnight" label="Midnight">
                                 <on_click function="World.EnvSettings" userdata="midnight" />
                         </menu_item_call>
-                        <menu_item_call bottom="-105" enabled="false" height="19" label="Revert to Region Default"
-                             left="0" mouse_opaque="true" name="Revert to Region Default" width="169">
+                        <menu_item_call name="Revert to Region Default" enabled="false"
+                             label="Revert to Region Default">
                                 <on_click function="World.EnvSettings" userdata="default" />
                         </menu_item_call>
-                        <menu_item_separator bottom="-113" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator" width="169" />
-                        <menu_item_call bottom="-132" enabled="false" height="19" label="Environment Editor" left="0"
-                             mouse_opaque="true" name="Environment Editor" width="169">
+                        <menu_item_separator />
+                        <menu_item_call name="Environment Editor" enabled="false"
+                             label="Environment Editor">
                                 <on_click function="World.EnvSettings" userdata="editor" />
                         </menu_item_call>
                 </menu>
         </menu>
-        <menu bottom="-18" create_jump_keys="true" drop_shadow="true" enabled="true"
-             height="510" label="Tools" left="0" mouse_opaque="false" name="Tools"
-             opaque="true" tear_off="true" visible="false" width="250">
-                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-                     height="109" label="Select Tool" left="0" mouse_opaque="false"
-                     name="Select Tool" opaque="true" tear_off="true" width="118">
-                        <menu_item_call bottom="-29" enabled="true" height="19" label="Focus" left="0"
-                             mouse_opaque="true" name="Focus" shortcut="control|1" width="118">
+
+
+
+  <!-- TOOLS -->
+
+        <menu name="Tools" create_jump_keys="true" label="Tools"
+             opaque="true" tear_off="true" visible="false">
+                <menu name="Select Tool" create_jump_keys="true" label="Select Tool"
+                     opaque="true" tear_off="true">
+                        <menu_item_call name="Focus" label="Focus" shortcut="control|1">
                                 <on_click function="Tools.SelectTool" userdata="focus" />
                         </menu_item_call>
-                        <menu_item_call bottom="-48" enabled="true" height="19" label="Move" left="0"
-                             mouse_opaque="true" name="Move" shortcut="control|2" width="118">
+                        <menu_item_call name="Move" label="Move" shortcut="control|2">
                                 <on_click function="Tools.SelectTool" userdata="move" />
                         </menu_item_call>
-                        <menu_item_call bottom="-67" enabled="true" height="19" label="Edit" left="0"
-                             mouse_opaque="true" name="Edit" shortcut="control|3" width="118">
+                        <menu_item_call name="Edit" label="Edit" shortcut="control|3">
                                 <on_click function="Tools.SelectTool" userdata="edit" />
                         </menu_item_call>
-                        <menu_item_call bottom="-86" enabled="true" height="19" label="Create" left="0"
-                             mouse_opaque="true" name="Create" shortcut="control|4" width="118">
+                        <menu_item_call name="Create" label="Create" shortcut="control|4">
                                 <on_click function="Tools.SelectTool" userdata="create" />
                         </menu_item_call>
-                        <menu_item_call bottom="-105" enabled="true" height="19" label="Land" left="0"
-                             mouse_opaque="true" name="Land" shortcut="control|5" width="118">
+                        <menu_item_call name="Land" label="Land" shortcut="control|5">
                                 <on_click function="Tools.SelectTool" userdata="land" />
                         </menu_item_call>
                 </menu>
-                <menu_item_separator bottom="-37" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator" width="250" />
-                <menu_item_check bottom="-56" enabled="true" height="19" label="Select Only My Objects" left="0"
-                     mouse_opaque="true" name="Select Only My Objects" width="250">
+                <menu_item_separator />
+                <menu_item_check name="Select Only My Objects"
+                     label="Select Only My Objects">
                         <on_click function="Tools.SelectOnlyMyObjects" userdata="agents" />
                         <on_check control="SelectOwnedOnly" />
                 </menu_item_check>
-                <menu_item_check bottom="-75" enabled="true" height="19" label="Select Only Movable Objects"
-                     left="0" mouse_opaque="true" name="Select Only Movable Objects" width="250">
+                <menu_item_check name="Select Only Movable Objects"
+                     label="Select Only Movable Objects">
                         <on_click function="Tools.SelectOnlyMovableObjects" userdata="movable" />
                         <on_check control="SelectMovableOnly" />
                 </menu_item_check>
-                <menu_item_check bottom="-94" enabled="true" height="19" label="Select By Surrounding" left="0"
-                     mouse_opaque="true" name="Select By Surrounding" width="250">
+                <menu_item_check name="Select By Surrounding" label="Select By Surrounding">
                         <on_click function="Tools.SelectBySurrounding" userdata="" />
                         <on_check control="RectangleSelectInclusive" />
                 </menu_item_check>
-                <menu_item_check bottom="-113" enabled="true" height="19" label="Show Hidden Selection" left="0"
-                     mouse_opaque="true" name="Show Hidden Selection" width="250">
+                <menu_item_check name="Show Hidden Selection" label="Show Hidden Selection">
                         <on_click function="Tools.ShowHiddenSelection" userdata="" />
                         <on_check control="RenderHiddenSelections" />
                 </menu_item_check>
-                <menu_item_check bottom="-132" enabled="true" height="19"
-                     label="Show Light Radius for Selection" left="0" mouse_opaque="true"
-                     name="Show Light Radius for Selection" width="250">
+                <menu_item_check name="Show Light Radius for Selection"
+                     label="Show Light Radius for Selection">
                         <on_click function="Tools.ShowSelectionLightRadius" userdata="" />
                         <on_check control="RenderLightRadius" />
                 </menu_item_check>
-                <menu_item_check bottom="-151" enabled="true" height="19" label="Show Selection Beam" left="0"
-                     mouse_opaque="true" name="Show Selection Beam" width="250">
+                <menu_item_check name="Show Selection Beam" label="Show Selection Beam">
                         <on_click function="ToggleControl" userdata="ShowSelectionBeam" />
                         <on_check control="ShowSelectionBeam" />
                 </menu_item_check>
-                <menu_item_separator bottom="-159" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator2" width="250" />
-                <menu_item_check bottom="-178" enabled="false" height="19" label="Snap to Grid" left="0"
-                     mouse_opaque="true" name="Snap to Grid" shortcut="G" width="250">
+                <menu_item_separator />
+                <menu_item_check name="Snap to Grid" enabled="false" label="Snap to Grid"
+                     shortcut="G">
                         <on_click function="ToggleControl" userdata="SnapEnabled" />
                         <on_check control="SnapEnabled" />
                         <on_enable function="Tools.EnableToolNotPie" />
                 </menu_item_check>
-                <menu_item_call bottom="-197" enabled="false" height="19" label="Snap Object XY to Grid"
-                     left="0" mouse_opaque="true" name="Snap Object XY to Grid"
-                     shortcut="shift|X" width="250">
+                <menu_item_call name="Snap Object XY to Grid" enabled="false"
+                     label="Snap Object XY to Grid" shortcut="shift|X">
                         <on_click function="Tools.SnapObjectXY" userdata="" />
                         <on_enable function="Tools.EnableToolNotPie" />
                 </menu_item_call>
-                <menu_item_call bottom="-216" enabled="false" height="19" label="Use Selection for Grid"
-                     left="0" mouse_opaque="true" name="Use Selection for Grid"
-                     shortcut="shift|G" width="250">
+                <menu_item_call name="Use Selection for Grid" enabled="false"
+                     label="Use Selection for Grid" shortcut="shift|G">
                         <on_click function="Tools.UseSelectionForGrid" userdata="" />
                         <on_enable function="SomethingSelected" />
                 </menu_item_call>
-                <menu_item_call bottom="-235" enabled="false" height="19" label="Grid Options..." left="0"
-                     mouse_opaque="true" name="Grid Options..." shortcut="control|shift|B"
-                     width="250">
+                <menu_item_call name="Grid Options..." enabled="false"
+                     label="Grid Options..." shortcut="control|shift|B">
                         <on_click function="ShowFloater" userdata="grid options" />
                         <on_enable function="Tools.EnableToolNotPie" />
                 </menu_item_call>
-                <menu_item_separator bottom="-243" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator3" width="250" />
-                <menu_item_check bottom="" enabled="false" height="" label="Edit Linked Parts" left=""
-                     mouse_opaque="true" name="Edit Linked Parts" shortcut="" width="">
+                <menu_item_separator />
+                <menu_item_check name="Edit Linked Parts" enabled="false"
+                     label="Edit Linked Parts" shortcut="">
                         <on_click function="ToggleControl" userdata="EditLinkedParts" />
                         <on_click function="Tools.EditLinkedParts" userdata="" />
                         <on_check control="EditLinkedParts" />
                         <on_enable function="Tools.EnableToolNotPie" />
                 </menu_item_check>
-                <menu_item_call bottom="-262" enabled="false" height="19" label="Link" left="0"
-                     mouse_opaque="true" name="Link" shortcut="control|L" width="250">
+                <menu_item_call name="Link" enabled="false" label="Link"
+                     shortcut="control|L">
                         <on_click function="Tools.Link" userdata="" />
                         <on_enable function="Tools.EnableLink" />
                 </menu_item_call>
-                <menu_item_call bottom="-281" enabled="false" height="19" label="Unlink" left="0"
-                     mouse_opaque="true" name="Unlink" shortcut="control|shift|L" width="250">
+                <menu_item_call name="Unlink" enabled="false" label="Unlink"
+                     shortcut="control|shift|L">
                         <on_click function="Tools.Unlink" userdata="" />
                         <on_enable function="Tools.EnableUnlink" />
                 </menu_item_call>
-                <menu_item_separator bottom="-289" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator4" width="250" />
-                <menu_item_call bottom="-308" enabled="false" height="19" label="Focus on Selection" left="0"
-                     mouse_opaque="true" name="Focus on Selection" shortcut="H" width="250">
+                <menu_item_separator />
+                <menu_item_call name="Focus on Selection" enabled="false"
+                     label="Focus on Selection" shortcut="H">
                         <on_click function="Tools.LookAtSelection" userdata="focus" />
                         <on_enable function="Tools.SomethingSelectedNoHUD" />
                 </menu_item_call>
-                <menu_item_call bottom="-327" enabled="false" height="19" label="Zoom to Selection" left="0"
-                     mouse_opaque="true" name="Zoom to Selection" shortcut="shift|H" width="250">
+                <menu_item_call name="Zoom to Selection" enabled="false"
+                     label="Zoom to Selection" shortcut="shift|H">
                         <on_click function="Tools.LookAtSelection" userdata="zoom" />
                         <on_enable function="Tools.SomethingSelectedNoHUD" />
                 </menu_item_call>
-                <menu_item_call bottom="-346" enabled="false" height="19" label="Buy Object" left="0"
-                     mouse_opaque="true" name="Menu Object Take" visible="false" width="250">
+                <menu_item_call name="Menu Object Take" enabled="false" label="Buy Object"
+                     visible="false">
                         <on_click function="Tools.BuyOrTake" userdata="" />
                         <on_enable function="Tools.EnableBuyOrTake" userdata="Buy,Take" />
                 </menu_item_call>
-                <menu_item_call bottom="-365" enabled="false" height="19" label="Take Copy" left="0"
-                     mouse_opaque="true" name="Take Copy" width="250">
+                <menu_item_call name="Take Copy" enabled="false" label="Take Copy">
                         <on_click function="Tools.TakeCopy" userdata="" />
                         <on_enable function="Tools.EnableTakeCopy" />
                 </menu_item_call>
-                <menu_item_call enabled="false" label="Return Object" mouse_opaque="true" name="Return...">
+                <menu_item_call name="Return..." enabled="false" label="Return Object">
                         <on_click function="Object.Return" />
                         <on_enable function="Object.EnableReturn" />
                 </menu_item_call>
-                <menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator6" width="250" />
-                <menu_item_call bottom="-384" enabled="false" height="19"
-                     label="Save Object Back to My Inventory" left="0" mouse_opaque="true"
-                     name="Save Object Back to My Inventory" width="250">
+                <menu_item_call name="Save Object Back to My Inventory" enabled="false"
+                     label="Save Object Back to My Inventory">
                         <on_click function="Tools.SaveToInventory" userdata="" />
                         <on_enable function="Tools.EnableSaveToInventory" />
                 </menu_item_call>
-                <menu_item_call bottom="-403" enabled="false" height="19"
-                     label="Save Object Back to Object Contents" left="0" mouse_opaque="true"
-                     name="Save Object Back to Object Contents" width="250">
+                <menu_item_call name="Save Object Back to Object Contents" enabled="false"
+                     label="Save Object Back to Object Contents">
                         <on_click function="Tools.SaveToObjectInventory" userdata="" />
                         <on_enable function="Tools.EnableSaveToObjectInventory" />
                 </menu_item_call>
-                <menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator6" width="250" />
-                <menu_item_call bottom="-430" enabled="true" height="19"
-                     label="Show Script Warning/Error Window" left="0" mouse_opaque="true"
-                     name="Show Script Warning/Error Window" width="250">
+                <menu_item_separator />
+                <menu_item_call name="Show Script Warning/Error Window"
+                     label="Show Script Warning/Error Window">
                         <on_click function="ShowFloater" userdata="script errors" />
                 </menu_item_call>
-                <menu_item_call bottom="-449" enabled="false" height="19"
-                     label="Recompile Scripts in Selection" left="0" mouse_opaque="true"
-                     name="Recompile Scripts in Selection" width="250">
+                <menu_item_call name="Recompile Scripts in Selection" enabled="false"
+                     label="Recompile Scripts in Selection">
                         <on_click function="Tools.SelectedScriptAction" userdata="compile" />
                         <on_enable function="EditableSelected" />
                 </menu_item_call>
-                <menu_item_call bottom="-468" enabled="false" height="19" label="Reset Scripts in Selection"
-                     left="0" mouse_opaque="true" name="Reset Scripts in Selection" width="250">
+                <menu_item_call name="Reset Scripts in Selection" enabled="false"
+                     label="Reset Scripts in Selection">
                         <on_click function="Tools.SelectedScriptAction" userdata="reset" />
                         <on_enable function="EditableSelected" />
                 </menu_item_call>
-                <menu_item_call bottom="-487" enabled="false" height="19"
-                     label="Set Scripts to Running in Selection" left="0" mouse_opaque="true"
-                     name="Set Scripts to Running in Selection" width="250">
+                <menu_item_call name="Set Scripts to Running in Selection" enabled="false"
+                     label="Set Scripts to Running in Selection">
                         <on_click function="Tools.SelectedScriptAction" userdata="start" />
                         <on_enable function="EditableSelected" />
                 </menu_item_call>
-                <menu_item_call bottom="-506" enabled="false" height="19"
-                     label="Set Scripts to Not Running in Selection" left="0"
-                     mouse_opaque="true" name="Set Scripts to Not Running in Selection"
-                     width="250">
+                <menu_item_call name="Set Scripts to Not Running in Selection"
+                     enabled="false" label="Set Scripts to Not Running in Selection">
                         <on_click function="Tools.SelectedScriptAction" userdata="stop" />
                         <on_enable function="EditableSelected" />
                 </menu_item_call>
         </menu>
-        <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
-             height="317" label="Help" left="227" mouse_opaque="false" name="Help"
-             opaque="true" tear_off="true" width="166">
-                <menu_item_call bottom="-29" enabled="true" height="19" label="Second Life Help" left="0"
-                     mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">
+
+
+
+  <!-- HELP -->
+
+        <menu create_jump_keys="true" label="Help" name="Help"
+             opaque="true" tear_off="true">
+                <menu_item_call name="Second Life Help" label="Second Life Help"
+                     shortcut="F1">
                         <on_click function="ShowFloater" userdata="help f1" />
                 </menu_item_call>
-                <menu_item_call bottom="-48" enabled="true" height="19" label="Tutorial" left="0"
-                     mouse_opaque="true" name="Tutorial" width="166">
+                <menu_item_call name="Tutorial" label="Tutorial">
                         <on_click function="ShowFloater" userdata="help tutorial" />
                 </menu_item_call>
-                <menu_item_separator bottom="-75" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator" width="166" />
-                <menu_item_call bottom="-94" enabled="true" height="19" label="Official Linden Blog..."
-                     left="0" mouse_opaque="true" name="Official Linden Blog..." width="166">
+                <menu_item_separator />
+                <menu_item_call name="Official Linden Blog..."
+                     label="Official Linden Blog...">
                         <on_click function="PromptShowURL"
                              userdata="WebLaunchSupportWiki,http://blog.secondlife.com/" />
                 </menu_item_call>
-                <menu_item_separator bottom="-102" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator2" width="166" />
-                <menu_item_call bottom="-121" enabled="true" height="19" label="Scripting Guide..." left="0"
-                     mouse_opaque="true" name="Scripting Guide..." width="166">
+                <menu_item_separator />
+                <menu_item_call name="Scripting Guide..." label="Scripting Guide...">
                         <on_click function="PromptShowFile" userdata="WebLaunchLSLGuide,lsl_guide.html" />
                 </menu_item_call>
-                <menu_item_call bottom="-140" enabled="true" height="19" label="Scripting Portal..." left="0"
-                     mouse_opaque="true" name="Scripting Portal..." width="166">
+                <menu_item_call name="Scripting Portal..." label="Scripting Portal...">
                         <on_click function="PromptShowURL"
                              userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal" />
                 </menu_item_call>
-                <menu_item_separator bottom="-148" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator3" width="166" />
-                <menu_item_call bottom="-194" enabled="true" height="19" label="Report Abuse..." left="0"
-                     mouse_opaque="true" name="Report Abuse..." width="166">
+                <menu_item_separator />
+                <menu_item_call name="Report Abuse..." label="Report Abuse...">
                         <on_click function="ShowFloater" userdata="complaint reporter" />
                 </menu_item_call>
-                <menu_item_call bottom="-213" enabled="true" height="19" label="Bumps, Pushes &amp; Hits..."
-                     left="0" mouse_opaque="true" name="Bumps, Pushes &amp;amp; Hits..."
-                     width="166">
+                <menu_item_call name="Bumps, Pushes &amp;amp; Hits..."
+                     label="Bumps, Pushes &amp; Hits...">
                         <on_click function="ShowFloater" userdata="mean events" />
                 </menu_item_call>
-                <menu_item_call label="Lag Meter" name="Lag Meter">
+                <menu_item_call name="Lag Meter" label="Lag Meter">
                         <on_click function="ShowFloater" userdata="lag meter" />
                 </menu_item_call>
-                <menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator7" width="250" />
-                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-                     height="109" label="Bug Reporting" left="0" mouse_opaque="false"
-                     name="Bug Reporting" opaque="true" tear_off="true" width="118">
-                        <menu_item_call bottom="-94" enabled="true" height="19" label="Public Issue Tracker..."
-                             left="0" mouse_opaque="true" name="Public Issue Tracker..." width="166">
+                <menu_item_separator />
+                <menu name="Bug Reporting" create_jump_keys="true" label="Bug Reporting"
+                     opaque="true" tear_off="true">
+                        <menu_item_call name="Public Issue Tracker..."
+                             label="Public Issue Tracker...">
                                 <on_click function="PromptShowURL"
                                      userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
                         </menu_item_call>
-                        <menu_item_call bottom="-94" enabled="true" height="19" label="Public Issue Tracker Help..."
-                             left="0" mouse_opaque="true" name="Publc Issue Tracker Help..." width="166">
+                        <menu_item_call name="Publc Issue Tracker Help..."
+                             label="Public Issue Tracker Help...">
                                 <on_click function="PromptShowURL"
                                      userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
                         </menu_item_call>
-                        <menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator7" width="250" />
-                        <menu_item_call bottom="-94" enabled="true" height="19" label="Bug Reporting 101..." left="0"
-                             mouse_opaque="true" name="Bug Reporing 101..." width="166">
+                        <menu_item_separator />
+                        <menu_item_call name="Bug Reporing 101..." label="Bug Reporting 101...">
                                 <on_click function="PromptShowURL"
                                      userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" />
                         </menu_item_call>
-                        <menu_item_call bottom="-94" enabled="true" height="19" label="Security Issues..." left="0"
-                             mouse_opaque="true" name="Security Issues..." width="166">
+                        <menu_item_call name="Security Issues..." label="Security Issues...">
                                 <on_click function="PromptShowURL"
                                      userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />
                         </menu_item_call>
-                        <menu_item_call bottom="-94" enabled="true" height="19" label="QA Wiki..." left="0"
-                             mouse_opaque="true" name="QA Wiki..." width="166">
+                        <menu_item_call name="QA Wiki..." label="QA Wiki...">
                                 <on_click function="PromptShowURL"
                                      userdata="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />
                         </menu_item_call>
-                        <menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator9" width="250" />
-                        <menu_item_call bottom="-240" enabled="true" height="19" label="Report Bug..." left="0"
-                             mouse_opaque="true" name="Report Bug..." width="166">
+                        <menu_item_separator />
+                        <menu_item_call name="Report Bug..." label="Report Bug...">
                                 <on_click function="PromptShowURL"
                                      userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
                         </menu_item_call>
                 </menu>
-                <menu_item_separator bottom="-221" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator5" width="166" />
-                <menu_item_call bottom="-121" enabled="true" height="19" label="Release Notes..." left="0"
-                     mouse_opaque="true" name="Release Notes..." width="166">
+                <menu_item_separator />
+                <menu_item_call name="Release Notes..." label="Release Notes...">
                         <on_click function="PromptShowFile" userdata="WebLaunchReleaseNotes,releasenotes.txt" />
                 </menu_item_call>
-                <menu_item_separator bottom="-294" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator6" width="166" />
-                <menu_item_call bottom="-313" enabled="true" height="19" label="About Second Life..." left="0"
-                     mouse_opaque="true" name="About Second Life..." width="166">
+                <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>
+        <!-- Disabled because it doesn't seem to be used anymore.
+        <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>