3 files changed, 29 insertions, 9 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index b255883..4dedf49 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -4542,6 +4542,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
@@ -9501,6 +9520,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");
@@ -9511,6 +9532,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");
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 9b2c566..7e6c24f 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -2357,14 +2357,6 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
         }
 
         // Explicit hack for debug menu.
-        if ((MASK_ALT & mask) &&
-                (MASK_CONTROL & mask) &&
-                ('D' == key || 'd' == key))
-        {
-                toggle_debug_menus(NULL);
-        }
-
-                // Explicit hack for debug menu.
         if ((mask == (MASK_SHIFT | MASK_CONTROL)) &&
                 ('G' == key || 'g' == key))
         {
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 72b828d..d0f0bac 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
@@ -397,11 +397,17 @@
         <on_click function="View.ZoomOut" userdata="" />
       </menu_item_call>
     </menu>
-    <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_separator />
+    <menu_item_check name="Toggle Advanced Menu" 
+                    label="Advanced Menu"
+                    shortcut="control|alt|D">
+      <on_click function="View.ToggleAdvanced" userdata="" />
+      <on_check function="View.CheckAdvanced" />
+    </menu_item_check>
   </menu>