diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-03-15 12:33:46 +0200 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-03-15 12:33:46 +0200 |
| commit | ee4fbb8e37ca20ebfbf85845dbb67941b7abfd29 (patch) | |
| tree | c354e8c386a28bfe5858061bdf5e9fb4f5ad30a7 /indra/newview/llimview.cpp | |
| parent | 5c54975096335cc2501e757d5e6deda9f771eed8 (diff) | |
CHUI-830 FIXED Button for collapsing torn-off floater(to a single input line) is added.
Show toasts for new messages for that conversation, regardless of other prefs.
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 1d62a32fc2..d04e76c0b3 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -226,17 +226,18 @@ void on_new_message(const LLSD& msg) && !session_floater->isMinimized() && !(session_floater->getHost() && session_floater->getHost()->isMinimized()); - if ("toast" == action && !session_floater_is_open) + bool conversation_floater_collapsed = !session_floater->isMessagePaneExpanded(); + if (("toast" == action && !session_floater_is_open) || conversation_floater_collapsed) { //User is not focused on conversation containing the message - if(session_floater_not_focused) + if(session_floater_not_focused || conversation_floater_collapsed) { if(!LLMuteList::getInstance()->isMuted(participant_id)) { im_box->flashConversationItemWidget(session_id, true); } //The conversation floater isn't focused/open - if(conversation_floater_not_focused) + if(conversation_floater_not_focused || conversation_floater_collapsed) { if(!LLMuteList::getInstance()->isMuted(participant_id) && !gAgent.isDoNotDisturb()) |