diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-08-04 15:34:34 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-08-04 15:34:34 -0700 |
| commit | 33cc363a6813bf6c1268fa85747d1d403e00f8e5 (patch) | |
| tree | d30696b245c4b5eb70575582d0dd9ddc4b20e5c7 /indra/newview/lltoastalertpanel.cpp | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
| parent | 89434ef6e64462041368ab26e049011fc84ae1e3 (diff) | |
Merged in latest viewer-2.0.0-3 up through svn r129410. LLFloaterTOS needs some post-merge cleanup.
Diffstat (limited to 'indra/newview/lltoastalertpanel.cpp')
| -rw-r--r-- | indra/newview/lltoastalertpanel.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/lltoastalertpanel.cpp b/indra/newview/lltoastalertpanel.cpp index afaa01a77a..5d67015526 100644 --- a/indra/newview/lltoastalertpanel.cpp +++ b/indra/newview/lltoastalertpanel.cpp @@ -66,7 +66,8 @@ static const S32 HPAD = 25; static const S32 BTN_HPAD = 8; LLToastAlertPanel::LLToastAlertPanel( LLNotificationPtr notification, bool modal) - : LLToastPanel(notification), + : LLFloater(LLSD()), + LLToastPanel(notification), mDefaultOption( 0 ), mCheck(NULL), mCaution(notification->getPriority() >= NOTIFICATION_PRIORITY_HIGH), @@ -359,11 +360,6 @@ void LLToastAlertPanel::setVisible( BOOL visible ) } } -void LLToastAlertPanel::onClose(bool app_quitting) -{ - LLFloater::onClose(app_quitting); -} - LLToastAlertPanel::~LLToastAlertPanel() { } |