3 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index f386888..f5d4012 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,12 @@
 2009-05-25  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+        * linden/indra/newview/llpanellogin.cpp:
+        User-initiated Toggle Fullscreen has a confirmation dialog now.
+        That's in the View menu and also Alt+Enter at login screen.
+        * linden/indra/newview/llviewermenu.cpp:
+        Ditto.
+
+
         * linden/indra/newview/llviewerwindow.cpp:
         Added Toggle Fullscreen confirmation and callback methods.
           LLViewerWindow::toggleFullscreenConfirm()
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index aeb3b2d..7f654bb 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -538,7 +538,7 @@ BOOL LLPanelLogin::handleKeyHere(KEY key, MASK mask)
 {
         if (( KEY_RETURN == key ) && (MASK_ALT == mask))
         {
-                gViewerWindow->toggleFullscreen(FALSE);
+                gViewerWindow->toggleFullscreenConfirm();
                 return TRUE;
         }
 
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 37f9ad2..4194ff7 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -3262,7 +3262,7 @@ class LLViewFullscreen : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                gViewerWindow->toggleFullscreen(TRUE);
+                gViewerWindow->toggleFullscreenConfirm();
                 return true;
         }
 };