diff options
| author | callum <none@none> | 2009-10-30 12:56:14 -0700 |
|---|---|---|
| committer | callum <none@none> | 2009-10-30 12:56:14 -0700 |
| commit | a98591802a46a0ae5b09bbc3eb530d76b49cb2b4 (patch) | |
| tree | 7f132dd2c7ffc9d5bdadbe8f22b043cf26c0f224 /indra/newview/lltoast.cpp | |
| parent | 5702da187ddda62fd19e40c94ed35665c6d6101e (diff) | |
| parent | 4cd831152284f71d72ea37e67a895283a4c4d347 (diff) | |
Merge
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); } |