diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-12-21 16:28:33 +0200 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-12-21 16:28:33 +0200 |
| commit | 7549a392cc32dc36f0bc673a6569f01731cc1bbd (patch) | |
| tree | 891518fd3fbf267a19df7ccdf3b28e7ad9de022f | |
| parent | 6df0377d1dd810cc1656c6c2664af2c7c87705fc (diff) | |
CHUI-566 Flashing and color on Conversations FUI button and conversation line item:
change behavior for the case "If conversations (container) floater open but not on top"
| -rw-r--r-- | indra/newview/llimview.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 708400cbe1..d736b81bb7 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -160,6 +160,7 @@ void on_new_message(const LLSD& msg) //session floater not focused (visible or not) bool session_floater_not_focused = session_floater && !session_floater->hasFocus(); + //conv. floater is closed bool conversation_floater_is_closed = !( im_box @@ -210,20 +211,16 @@ void on_new_message(const LLSD& msg) else if ("flash" == action) { - if (session_floater_not_focused) + if (conversation_floater_not_focused) { - //User is not focused on conversation containing the message - - if(conversation_floater_not_focused) + if(session_floater_not_focused) { + //User is not focused on conversation containing the message gToolBarView->flashCommand(LLCommandId("chat"), true); } - //conversation floater is open but a different conversation is focused - //else - //{ - im_box->flashConversationItemWidget(session_id, true); - //} - } + + im_box->flashConversationItemWidget(session_id, true); + } } else if("openconversations" == action) |