aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-11-09 14:58:57 -0700
committerMcCabe Maxsted2009-11-09 14:58:57 -0700
commitb6f4e9794116c10e30e61e926f40fb68c86141af (patch)
tree7416a21fbe2b788b828cf394057c70b2bdbbda9f /linden/indra/newview/llviewerwindow.cpp
parentRemoved RLVa temporarily from First Use (diff)
downloadmeta-impy-b6f4e9794116c10e30e61e926f40fb68c86141af.zip
meta-impy-b6f4e9794116c10e30e61e926f40fb68c86141af.tar.gz
meta-impy-b6f4e9794116c10e30e61e926f40fb68c86141af.tar.bz2
meta-impy-b6f4e9794116c10e30e61e926f40fb68c86141af.tar.xz
Moved 1.2 alerts to the new notification system
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewerwindow.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 022515a..ef4e728 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -4484,20 +4484,22 @@ void LLViewerWindow::initFonts(F32 zoom_factor)
4484 4484
4485void LLViewerWindow::toggleFullscreenConfirm() 4485void LLViewerWindow::toggleFullscreenConfirm()
4486{ 4486{
4487 gViewerWindow->alertXml("ConfirmToggleFullscreen", 4487 LLNotifications::instance().add("ConfirmToggleFullscreen",
4488 LLViewerWindow::toggleFullscreenCallback, 4488 LLSD(),
4489 (void *)this); 4489 LLSD(),
4490 boost::bind(&toggleFullscreenCallback, _1, _2, this));
4490} 4491}
4491 4492
4492 4493
4493// static 4494bool LLViewerWindow::toggleFullscreenCallback(const LLSD& notification, const LLSD& response, LLViewerWindow *self)
4494void LLViewerWindow::toggleFullscreenCallback(S32 option, void *userdata)
4495{ 4495{
4496 S32 option = LLNotification::getSelectedOption(notification, response);
4496 if( option == 0 ) 4497 if( option == 0 )
4497 { 4498 {
4498 // User confirmed it. Here we go! 4499 // User confirmed it. Here we go!
4499 ((LLViewerWindow *)userdata)->toggleFullscreen( TRUE ); 4500 self->toggleFullscreen( TRUE );
4500 } 4501 }
4502 return false;
4501} 4503}
4502 4504
4503 4505