diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-06-11 15:30:31 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-06-11 15:30:31 +0300 |
| commit | 0cf9597bd55782b4a463f3e07767269e80432db6 (patch) | |
| tree | 9442007a72779c0665ebb05894e7590cfc9e5ecf /indra/llui/llbutton.cpp | |
| parent | 45f3ca1667f404190ff2bb762f39cedd58ef7abb (diff) | |
CHUI-926 FIXED FUI button will stay highlight(orange) if there are unread IMs when the conversation floater is minimized.
Diffstat (limited to 'indra/llui/llbutton.cpp')
| -rwxr-xr-x | indra/llui/llbutton.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index a8149a9a1d..44f2c1efe9 100755 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -644,7 +644,7 @@ void LLButton::draw() // Cancel sticking of color, if the button is pressed, // or when a flashing of the previously selected button is ended if (mFlashingTimer - && ((selected && !mFlashingTimer->isFlashingInProgress()) || pressed)) + && ((selected && !mFlashingTimer->isFlashingInProgress() && !mForceFlashing) || pressed)) { mFlashing = false; } @@ -971,8 +971,9 @@ void LLButton::setToggleState(BOOL b) } } -void LLButton::setFlashing(bool b) +void LLButton::setFlashing(bool b, bool force_flashing/* = false */) { + mForceFlashing = force_flashing; if (mFlashingTimer) { mFlashing = b; |