diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-09-10 03:12:12 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-09-10 03:12:12 +0000 |
| commit | ccb1d2b1e43369803cf9ab1ffc7deefbac2db8fc (patch) | |
| tree | 57b085da51db0f63ab249926102f8ebbca8da1ee /indra/newview/lltoast.cpp | |
| parent | 44f294d484185ef3cb9f51e5cba6a3ee269b96dc (diff) | |
merge -r 1609-1612 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
Fixes: EXT-825 EXT-893 EXT-889 EXT-88
Diffstat (limited to 'indra/newview/lltoast.cpp')
| -rw-r--r-- | indra/newview/lltoast.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp index 85814a98c9..fb7574d68b 100644 --- a/indra/newview/lltoast.cpp +++ b/indra/newview/lltoast.cpp @@ -84,11 +84,7 @@ LLToast::LLToast(LLToast::Params p) : LLFloater(LLSD()), //-------------------------------------------------------------------------- BOOL LLToast::postBuild() { - if(mCanFade) - { - mTimer.start(); - } - else + if(!mCanFade) { mTimer.stop(); } @@ -209,6 +205,10 @@ void LLToast::setVisible(BOOL show) if(show) { setBackgroundOpaque(TRUE); + if(!mTimer.getStarted()) + { + mTimer.start(); + } } LLPanel::setVisible(show); if(mPanel) |