aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
authorJacek Antonelli2009-05-25 17:13:03 -0500
committerJacek Antonelli2009-05-25 20:22:34 -0500
commit67fc978ab935c861cd03659d248b7fc7a7b5369d (patch)
tree32ac950e00b010eef12684469a110bec15f2957e /linden/indra/newview
parentAdded Toggle Fullscreen confirmation and callback methods. (diff)
downloadmeta-impy-67fc978ab935c861cd03659d248b7fc7a7b5369d.zip
meta-impy-67fc978ab935c861cd03659d248b7fc7a7b5369d.tar.gz
meta-impy-67fc978ab935c861cd03659d248b7fc7a7b5369d.tar.bz2
meta-impy-67fc978ab935c861cd03659d248b7fc7a7b5369d.tar.xz
User-initiated Toggle Fullscreen has a confirmation dialog now.
That's in the View menu and also Alt+Enter at login screen.
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/llpanellogin.cpp2
-rw-r--r--linden/indra/newview/llviewermenu.cpp2
2 files changed, 2 insertions, 2 deletions
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)
538{ 538{
539 if (( KEY_RETURN == key ) && (MASK_ALT == mask)) 539 if (( KEY_RETURN == key ) && (MASK_ALT == mask))
540 { 540 {
541 gViewerWindow->toggleFullscreen(FALSE); 541 gViewerWindow->toggleFullscreenConfirm();
542 return TRUE; 542 return TRUE;
543 } 543 }
544 544
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
3262{ 3262{
3263 bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) 3263 bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
3264 { 3264 {
3265 gViewerWindow->toggleFullscreen(TRUE); 3265 gViewerWindow->toggleFullscreenConfirm();
3266 return true; 3266 return true;
3267 } 3267 }
3268}; 3268};