From eb853f55c07ae4a3c3f2aa05fbabcf2e4b4dc115 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Tue, 4 Aug 2009 01:12:59 +0000
Subject: svn merge -r 128442:129343
svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
---
indra/newview/llfloaternotificationsconsole.cpp | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
(limited to 'indra/newview/llfloaternotificationsconsole.cpp')
diff --git a/indra/newview/llfloaternotificationsconsole.cpp b/indra/newview/llfloaternotificationsconsole.cpp
index f06af5ca1e..7042882084 100644
--- a/indra/newview/llfloaternotificationsconsole.cpp
+++ b/indra/newview/llfloaternotificationsconsole.cpp
@@ -168,13 +168,6 @@ LLFloaterNotificationConsole::LLFloaterNotificationConsole(const LLSD& key)
//LLUICtrlFactory::instance().buildFloater(this, "floater_notifications_console.xml");
}
-void LLFloaterNotificationConsole::onClose(bool app_quitting)
-{
- setVisible(FALSE);
- //destroy();
-}
-
-
BOOL LLFloaterNotificationConsole::postBuild()
{
// these are in the order of processing
@@ -251,10 +244,10 @@ void LLFloaterNotificationConsole::onClickAdd()
//=============== LLFloaterNotification ================
LLFloaterNotification::LLFloaterNotification(LLNotification* note)
-: LLFloater(),
+: LLFloater(LLSD()),
mNote(note)
{
- LLUICtrlFactory::instance().buildFloater(this, "floater_notification.xml");
+ LLUICtrlFactory::instance().buildFloater(this, "floater_notification.xml", NULL);
}
BOOL LLFloaterNotification::postBuild()
--
cgit v1.2.3