summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llimview.cpp')
-rw-r--r--indra/newview/llimview.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 76a314f807..4171fa1235 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -274,7 +274,9 @@ void on_new_message(const LLSD& msg)
// 2. Flash line item
if ("openconversations" == user_preferences
- || ON_TOP == conversations_floater_status)
+ || ON_TOP == conversations_floater_status
+ || ("toast" == user_preferences && ON_TOP != conversations_floater_status)
+ || ("flash" == user_preferences && CLOSED == conversations_floater_status))
{
if(!LLMuteList::getInstance()->isMuted(participant_id))
{