diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-04-09 14:53:22 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-04-09 14:53:22 +0300 |
| commit | d35c61a21a42867551cb9b7c8893bc6097e3d5f8 (patch) | |
| tree | 346717e50a720da56f7bbd4d3262be678ac99000 /indra/newview/llimview.cpp | |
| parent | 52b9b52ff70c9dcd602d1c96c5d0429f90208a20 (diff) | |
CHUI-923 FIXED Show toasts if Conversation floater is focussed and current conversation is not selected.
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index afac94af07..fefbe941a4 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -299,9 +299,8 @@ void on_new_message(const LLSD& msg) // 4. Toast if ((("toast" == user_preferences) && - (CLOSED == conversations_floater_status - || NOT_ON_TOP == conversations_floater_status)) - || !session_floater->isMessagePaneExpanded()) + (ON_TOP_AND_ITEM_IS_SELECTED != conversations_floater_status)) + || !session_floater->isMessagePaneExpanded()) { //Show IM toasts (upper right toasts) |