diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-22 11:01:47 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-22 11:01:47 +0100 |
| commit | 7bb4436b488f70d842cd1382d8089ecae29234c0 (patch) | |
| tree | 6f0d100152f45ca313286595e139891d1e4a16b6 /indra/newview/lltoast.cpp | |
| parent | 144b8349b3f0773ac575e178a0e3109d963be9a8 (diff) | |
| parent | edd0e47d5cb3eb173da4d6710ce6a83f771a0246 (diff) | |
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/lltoast.cpp')
| -rw-r--r-- | indra/newview/lltoast.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp index 22b12ee132..568cd4cb19 100644 --- a/indra/newview/lltoast.cpp +++ b/indra/newview/lltoast.cpp @@ -67,6 +67,7 @@ LLToast::Params::Params() LLToast::LLToast(const LLToast::Params& p) : LLModalDialog(LLSD(), p.is_modal), mPanel(p.panel), + mToastLifetime(p.lifetime_secs), mToastFadingTime(p.fading_time_secs), mNotificationID(p.notif_id), mSessionID(p.session_id), @@ -241,6 +242,13 @@ void LLToast::draw() drawChild(mHideBtn); } } + + // if timer started and remaining time <= fading time + if (mTimer->getStarted() && (mToastLifetime + - mTimer->getEventTimer().getElapsedTimeF32()) <= mToastFadingTime) + { + setBackgroundOpaque(FALSE); + } } //-------------------------------------------------------------------------- |