diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-21 15:54:25 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-21 15:54:25 -0800 |
| commit | e8be7955d86d0673b35182ba1ae590748b4ba5d2 (patch) | |
| tree | ab72cdc6e4820772da95c276bfb4d8cead3a01b9 /indra/newview/llimview.cpp | |
| parent | ed61957b39435db775445f7344cbf1252270eb74 (diff) | |
| parent | dd7509f56de5e8a47680b33176e90c11ed518066 (diff) | |
merging in latest changes'
Diffstat (limited to 'indra/newview/llimview.cpp')
| -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) |