diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-30 23:22:41 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-30 23:22:41 +0000 |
| commit | e97f7728a90dd66014f6b3f0cd5e8d4c71f48691 (patch) | |
| tree | 4be178df6b50a3395105cdd3ac0044d6467a9fa3 /indra/newview/lltoast.cpp | |
| parent | d5aa10143a0e6457b3326ba839c81b7c956a015e (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3
Diffstat (limited to 'indra/newview/lltoast.cpp')
| -rw-r--r-- | indra/newview/lltoast.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp index 9144f9c3e0..6f5b25214e 100644 --- a/indra/newview/lltoast.cpp +++ b/indra/newview/lltoast.cpp @@ -104,6 +104,7 @@ bool LLToast::timerHasExpired() if (mTimer.getStarted()) { F32 elapsed_time = mTimer.getElapsedTimeF32(); + // after 4 seconds a toast should start fade if (elapsed_time > 4) { setBackgroundOpaque(FALSE); @@ -119,7 +120,7 @@ bool LLToast::timerHasExpired() //-------------------------------------------------------------------------- void LLToast::hide() { - setVisible(FALSE); //TODO: store in Chiclet's history + setVisible(FALSE); mIsViewed = false; mTimer.stop(); mOnFade(this, LLSD()); |