diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-14 14:31:25 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-14 14:31:25 -0700 |
| commit | 562006aa5585a42418cae978516505035cd34d8d (patch) | |
| tree | f42488d1b07907937f5b9e236617d9f02297d32d /indra/newview/lltoast.cpp | |
| parent | 9a8042d5a3edfd07727793a1939c3ab361ceec9a (diff) | |
| parent | 7cd1020f2953b776e1878e7b4e365d4b23e6b07b (diff) | |
Merge with SVN viewer-2.0.0-3 branch
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) |