Merged in jacek/next

1 files changed, 21 insertions, 0 deletions

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)