1 files changed, 22 insertions, 9 deletions

diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index f17d031..c0e4fed 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -513,7 +513,7 @@ public:
                         ypos += y_inc;
                 }
                 // only display these messages if we are actually rendering beacons at this moment
-                if (LLPipeline::getRenderBeacons(NULL) && gSavedSettings.getBOOL("BeaconAlwaysOn"))
+                if (LLPipeline::getRenderBeacons(NULL) && gSavedSettings.getBOOL("BeaconsEnabled"))
                 {
                         if (LLPipeline::getRenderParticleBeacons(NULL))
                         {
@@ -2409,14 +2409,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))
         {
@@ -4713,6 +4705,27 @@ void LLViewerWindow::initFonts(F32 zoom_factor)
                                                                 gDirUtilp->getAppRODataDir(),
                                                                 LLUICtrlFactory::getXUIPaths());
 }
+
+
+void LLViewerWindow::toggleFullscreenConfirm()
+{
+        gViewerWindow->alertXml("ConfirmToggleFullscreen",
+                                LLViewerWindow::toggleFullscreenCallback,
+                                (void *)this);
+}
+
+
+// static
+void LLViewerWindow::toggleFullscreenCallback(S32 option, void *userdata)
+{
+        if( option == 0 )
+        {
+                // User confirmed it. Here we go!
+                ((LLViewerWindow *)userdata)->toggleFullscreen( TRUE );
+        }
+}
+
+
 void LLViewerWindow::toggleFullscreen(BOOL show_progress)
 {
         if (mWindow)