3 files changed, 31 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 94ce7d8..f386888 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,13 @@
 2009-05-25  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+        * linden/indra/newview/llviewerwindow.cpp:
+        Added Toggle Fullscreen confirmation and callback methods.
+          LLViewerWindow::toggleFullscreenConfirm()
+          LLViewerWindow::toggleFullscreenCallback()
+        * linden/indra/newview/llviewerwindow.h (LLWindowCallbacks): 
+        Ditto.
+
+
         * linden/indra/newview/skins/default/xui/en-us/alerts.xml:
         Added ConfirmToggleFullscreen alert text.
 
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 854d757..0c43b59 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -4612,6 +4612,27 @@ void LLViewerWindow::initFonts(F32 zoom_factor)
                                     gDirUtilp->getAppRODataDir()
                                     );
 }
+
+
+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)
diff --git a/linden/indra/newview/llviewerwindow.h b/linden/indra/newview/llviewerwindow.h
index 21df0d5..d562d0f 100644
--- a/linden/indra/newview/llviewerwindow.h
+++ b/linden/indra/newview/llviewerwindow.h
@@ -338,6 +338,8 @@ public:
 
         // Request display setting changes      
         void                    toggleFullscreen(BOOL show_progress);
+        void                    toggleFullscreenConfirm();
+        static void     toggleFullscreenCallback(S32 option, void *userdata);
 
         // handle shutting down GL and bringing it back up
         BOOL                    checkSettings();