diff options
author | Jacek Antonelli | 2009-05-25 04:16:10 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-05-25 20:22:34 -0500 |
commit | 544078d40e9affba321ef5e2d5ad665656462262 (patch) | |
tree | fec862bbbe403514d92b87125a88ab2e0dcd16f2 /linden | |
parent | Added ConfirmToggleFullscreen alert text. (diff) | |
download | meta-impy-544078d40e9affba321ef5e2d5ad665656462262.zip meta-impy-544078d40e9affba321ef5e2d5ad665656462262.tar.gz meta-impy-544078d40e9affba321ef5e2d5ad665656462262.tar.bz2 meta-impy-544078d40e9affba321ef5e2d5ad665656462262.tar.xz |
Added Toggle Fullscreen confirmation and callback methods.
LLViewerWindow::toggleFullscreenConfirm()
LLViewerWindow::toggleFullscreenCallback()
Diffstat (limited to 'linden')
-rw-r--r-- | linden/indra/newview/llviewerwindow.cpp | 21 | ||||
-rw-r--r-- | linden/indra/newview/llviewerwindow.h | 2 |
2 files changed, 23 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) | |||
4612 | gDirUtilp->getAppRODataDir() | 4612 | gDirUtilp->getAppRODataDir() |
4613 | ); | 4613 | ); |
4614 | } | 4614 | } |
4615 | |||
4616 | |||
4617 | void LLViewerWindow::toggleFullscreenConfirm() | ||
4618 | { | ||
4619 | gViewerWindow->alertXml("ConfirmToggleFullscreen", | ||
4620 | LLViewerWindow::toggleFullscreenCallback, | ||
4621 | (void *)this); | ||
4622 | } | ||
4623 | |||
4624 | |||
4625 | // static | ||
4626 | void LLViewerWindow::toggleFullscreenCallback(S32 option, void *userdata) | ||
4627 | { | ||
4628 | if( option == 0 ) | ||
4629 | { | ||
4630 | // User confirmed it. Here we go! | ||
4631 | ((LLViewerWindow *)userdata)->toggleFullscreen( TRUE ); | ||
4632 | } | ||
4633 | } | ||
4634 | |||
4635 | |||
4615 | void LLViewerWindow::toggleFullscreen(BOOL show_progress) | 4636 | void LLViewerWindow::toggleFullscreen(BOOL show_progress) |
4616 | { | 4637 | { |
4617 | if (mWindow) | 4638 | 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: | |||
338 | 338 | ||
339 | // Request display setting changes | 339 | // Request display setting changes |
340 | void toggleFullscreen(BOOL show_progress); | 340 | void toggleFullscreen(BOOL show_progress); |
341 | void toggleFullscreenConfirm(); | ||
342 | static void toggleFullscreenCallback(S32 option, void *userdata); | ||
341 | 343 | ||
342 | // handle shutting down GL and bringing it back up | 344 | // handle shutting down GL and bringing it back up |
343 | BOOL checkSettings(); | 345 | BOOL checkSettings(); |