From 8e3a85ed6650a4dc77bc9861dba18b06eb5e4725 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Thu, 28 Mar 2013 05:49:28 +0200
Subject: [PATCH] CHUI-896 FIXED Line flashing and FUI button flashing not
working correctly for CHUI notifications: added flashing of the line item
after conv. floater opens
---
indra/newview/llconversationview.cpp | 2 +-
indra/newview/llimview.cpp | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index 956abcd5869..b6c53e5e30f 100755
--- a/indra/newview/llconversationview.cpp
+++ b/indra/newview/llconversationview.cpp
@@ -120,7 +120,7 @@ void LLConversationViewSession::setFlashState(bool flash_state)
void LLConversationViewSession::startFlashing()
{
- if (mFlashStateOn && !mFlashStarted)
+ if (isInVisibleChain() && mFlashStateOn && !mFlashStarted)
{
mFlashStarted = true;
mFlashTimer->startFlashing();
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 76a314f8075..4171fa1235f 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))
{
--
GitLab