diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-03-27 16:10:07 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-03-27 16:10:07 -0700 |
| commit | dfa14269971fb102fbdd2c435d31d9eef1041f46 (patch) | |
| tree | 87e6a6900540c26cfcff6627696d57fc6c775993 /indra/newview/llimview.cpp | |
| parent | 9f819806cd0a2301c83a866d06594ce7b2f3c3d5 (diff) | |
| parent | d29a2e2977090e0e4cf4c392d64757a10fca91a9 (diff) | |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index a84dbcd84a..ca04d27d11 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -224,8 +224,9 @@ void on_new_message(const LLSD& msg) // actions: // 0. nothing - exit - if ("none" == user_preferences || + if (("none" == user_preferences || ON_TOP_AND_ITEM_IS_SELECTED == conversations_floater_status) + && session_floater->isMessagePaneExpanded()) { return; } @@ -294,9 +295,10 @@ void on_new_message(const LLSD& msg) } // 4. Toast - if ("toast" == user_preferences && + if (("toast" == user_preferences && (CLOSED == conversations_floater_status || NOT_ON_TOP == conversations_floater_status)) + || !session_floater->isMessagePaneExpanded()) { //Show IM toasts (upper right toasts) // Skip toasting for system messages and for nearby chat |