diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2013-03-28 05:49:28 +0200 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2013-03-28 05:49:28 +0200 |
| commit | 8e3a85ed6650a4dc77bc9861dba18b06eb5e4725 (patch) | |
| tree | 0ae221f005cb9f319a6da40568e789d51866e719 /indra | |
| parent | e76a4eb7c51ab662d5f463737361cfdb1e82bf67 (diff) | |
CHUI-896 FIXED Line flashing and FUI button flashing not working correctly for CHUI notifications: added flashing of the line item after conv. floater opens
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llconversationview.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llimview.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp index 956abcd586..b6c53e5e30 100755 --- a/indra/newview/llconversationview.cpp +++ b/indra/newview/llconversationview.cpp @@ -120,7 +120,7 @@ void LLConversationViewSession::setFlashState(bool flash_state) void LLConversationViewSession::startFlashing() { - if (mFlashStateOn && !mFlashStarted) + if (isInVisibleChain() && mFlashStateOn && !mFlashStarted) { mFlashStarted = true; mFlashTimer->startFlashing(); diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 76a314f807..4171fa1235 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -274,7 +274,9 @@ void on_new_message(const LLSD& msg) // 2. Flash line item if ("openconversations" == user_preferences - || ON_TOP == conversations_floater_status) + || ON_TOP == conversations_floater_status + || ("toast" == user_preferences && ON_TOP != conversations_floater_status) + || ("flash" == user_preferences && CLOSED == conversations_floater_status)) { if(!LLMuteList::getInstance()->isMuted(participant_id)) { |