diff options
| author | Richard Nelson <richard@lindenlab.com> | 2009-08-04 01:12:59 +0000 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2009-08-04 01:12:59 +0000 |
| commit | eb853f55c07ae4a3c3f2aa05fbabcf2e4b4dc115 (patch) | |
| tree | 7707fccb8d0946b6257d5ed7c5dfd3941c53eec0 /indra/newview/llfloaternotificationsconsole.cpp | |
| parent | db5cda26676f376f18816013c0c5e3fbad5b20d0 (diff) | |
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
Diffstat (limited to 'indra/newview/llfloaternotificationsconsole.cpp')
| -rw-r--r-- | indra/newview/llfloaternotificationsconsole.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
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() |