From b6f4e9794116c10e30e61e926f40fb68c86141af Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 9 Nov 2009 14:58:57 -0700
Subject: Moved 1.2 alerts to the new notification system
---
linden/indra/newview/llviewerwindow.cpp | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
(limited to 'linden/indra/newview/llviewerwindow.cpp')
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)
void LLViewerWindow::toggleFullscreenConfirm()
{
- gViewerWindow->alertXml("ConfirmToggleFullscreen",
- LLViewerWindow::toggleFullscreenCallback,
- (void *)this);
+ LLNotifications::instance().add("ConfirmToggleFullscreen",
+ LLSD(),
+ LLSD(),
+ boost::bind(&toggleFullscreenCallback, _1, _2, this));
}
-// static
-void LLViewerWindow::toggleFullscreenCallback(S32 option, void *userdata)
+bool LLViewerWindow::toggleFullscreenCallback(const LLSD& notification, const LLSD& response, LLViewerWindow *self)
{
+ S32 option = LLNotification::getSelectedOption(notification, response);
if( option == 0 )
{
// User confirmed it. Here we go!
- ((LLViewerWindow *)userdata)->toggleFullscreen( TRUE );
+ self->toggleFullscreen( TRUE );
}
+ return false;
}
--
cgit v1.1