diff options
| author | James Cook <james@lindenlab.com> | 2009-12-31 14:31:58 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-31 14:31:58 -0800 |
| commit | eb5a76996a1b1ce2ef30b6106287caae998dcc85 (patch) | |
| tree | c796af5a77c8ebfa7d9d09709c0b179e721490c8 /indra/newview/lltoast.cpp | |
| parent | 4e23ae312f0ab59c0c8c5b55c6c8450adf7d7f82 (diff) | |
| parent | 6f66ec64b9e360a002a6d658327b72aaaab9325a (diff) | |
Merge (viewer-2-0 into gooey)
Diffstat (limited to 'indra/newview/lltoast.cpp')
| -rw-r--r-- | indra/newview/lltoast.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp index 2a56b2cd3a..96d1624cd4 100644 --- a/indra/newview/lltoast.cpp +++ b/indra/newview/lltoast.cpp @@ -245,7 +245,7 @@ void LLToast::setVisible(BOOL show) if(show) { setBackgroundOpaque(TRUE); - if(!mTimer.getStarted()) + if(!mTimer.getStarted() && mCanFade) { mTimer.start(); } @@ -266,8 +266,6 @@ void LLToast::onMouseEnter(S32 x, S32 y, MASK mask) { mOnToastHoverSignal(this, MOUSE_ENTER); - setBackgroundOpaque(TRUE); - //toasts fading is management by Screen Channel sendChildToFront(mHideBtn); |