1 files changed, 22 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 7c556df..838f230 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -4550,6 +4550,25 @@ void print_agent_nvpairs(void*)
         llinfos << "Camera at " << gAgent.getCameraPositionGlobal() << llendl;
 }
 
+class LLViewToggleAdvanced : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                toggle_debug_menus(NULL);
+                return true;
+        }
+};
+
+class LLViewCheckAdvanced : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                BOOL new_value = gSavedSettings.getBOOL("UseDebugMenus");
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
+                return true;
+        }
+};
+
 void show_debug_menus()
 {
         // this can get called at login screen where there is no menu so only toggle it if one exists
@@ -9509,6 +9528,8 @@ void initialize_menus()
         addMenu(new LLViewZoomIn(), "View.ZoomIn");
         addMenu(new LLViewZoomDefault(), "View.ZoomDefault");
         addMenu(new LLViewFullscreen(), "View.Fullscreen");
+        addMenu(new LLViewToggleAdvanced(), "View.ToggleAdvanced");
+
 
         addMenu(new LLViewEnableMouselook(), "View.EnableMouselook");
         addMenu(new LLViewEnableLastChatter(), "View.EnableLastChatter");
@@ -9519,6 +9540,7 @@ void initialize_menus()
         addMenu(new LLViewCheckHighlightTransparent(), "View.CheckHighlightTransparent");
         addMenu(new LLViewCheckRenderType(), "View.CheckRenderType");
         addMenu(new LLViewCheckHUDAttachments(), "View.CheckHUDAttachments");
+        addMenu(new LLViewCheckAdvanced(), "View.CheckAdvanced");
 
         // World menu
         addMenu(new LLWorldChat(), "World.Chat");