diff options
| author | PavelK ProductEngine <pkrivich@productengine.com> | 2013-06-06 19:49:42 +0300 |
|---|---|---|
| committer | PavelK ProductEngine <pkrivich@productengine.com> | 2013-06-06 19:49:42 +0300 |
| commit | ab37c8b8f5d830af7155bf63c084dad76070cb42 (patch) | |
| tree | 7e3afc118eab0ef63ed86770e1c361b69fb18707 | |
| parent | bad8c183fe1e0f29685e7d648551effebfb096d9 (diff) | |
CHUI-896 ADD FIX Line flashing and FUI button flashing not working correctly for CHUI notifications
Fixed line flashing when conversations floater is open but does not have focus
| -rwxr-xr-x | indra/newview/llconversationview.cpp | 5 | ||||
| -rwxr-xr-x | indra/newview/llimview.cpp | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp index 0695337241..9bb9c826e5 100755 --- a/indra/newview/llconversationview.cpp +++ b/indra/newview/llconversationview.cpp @@ -127,7 +127,10 @@ void LLConversationViewSession::setHighlightState(bool hihglight_state) void LLConversationViewSession::startFlashing() { - if (isInVisibleChain() && mFlashStateOn && !mFlashStarted) + LLFloaterIMContainer* im_box = LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container"); + + // Need to start flashing only when "Conversations" is opened or brought on top + if (isInVisibleChain() && !im_box->isMinimized() && mFlashStateOn && !mFlashStarted) { mFlashStarted = true; mFlashTimer->startFlashing(); diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index ba96c5ee24..8d055be263 100755 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -311,9 +311,10 @@ void notify_of_message(const LLSD& msg, bool is_dnd_msg) } else { - if (is_dnd_msg && (ON_TOP == conversations_floater_status || + if ((is_dnd_msg && (ON_TOP == conversations_floater_status || NOT_ON_TOP == conversations_floater_status || CLOSED == conversations_floater_status)) + || CLOSED == conversations_floater_status) { im_box->highlightConversationItemWidget(session_id, true); } |