diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2009-10-30 21:28:52 -0600 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2009-10-30 21:28:52 -0600 |
commit | 01d06db0154e0cfc43c82664c6bf6129a3fa4883 (patch) | |
tree | 3e842ddedf605d6883be7f04de55c173c38aa46b /indra/newview/lltoast.cpp | |
parent | 801301c435414df1e22c321a685044b7cd43055e (diff) | |
parent | 9abcf6684e86b0b8c2d343ccd4864b2e854be3d7 (diff) |
sync to the tip.
Diffstat (limited to 'indra/newview/lltoast.cpp')
-rw-r--r-- | indra/newview/lltoast.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp index 24824a095c..903df21e78 100644 --- a/indra/newview/lltoast.cpp +++ b/indra/newview/lltoast.cpp @@ -49,13 +49,15 @@ LLToast::Params::Params() enable_hide_btn("enable_hide_btn", true), force_show("force_show", false), force_store("force_store", false), + fading_time_secs("fading_time_secs", gSavedSettings.getS32("ToastFadingTime")), lifetime_secs("lifetime_secs", gSavedSettings.getS32("NotificationToastLifeTime")) {}; LLToast::LLToast(const LLToast::Params& p) : LLModalDialog(LLSD(), p.is_modal), mPanel(p.panel), - mToastLifetime(p.lifetime_secs), + mToastLifetime(p.lifetime_secs), + mToastFadingTime(p.fading_time_secs), mNotificationID(p.notif_id), mSessionID(p.session_id), mCanFade(p.can_fade), @@ -127,7 +129,7 @@ bool LLToast::lifetimeHasExpired() if (mTimer.getStarted()) { F32 elapsed_time = mTimer.getElapsedTimeF32(); - if ((mToastLifetime - elapsed_time) <= gSavedSettings.getS32("ToastOpaqueTime")) + if ((mToastLifetime - elapsed_time) <= mToastFadingTime) { setBackgroundOpaque(FALSE); } |