summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
diff options
context:
space:
mode:
authorAlexanderP ProductEngine <apaschenko@productengine.com>2013-03-28 05:49:28 +0200
committerAlexanderP ProductEngine <apaschenko@productengine.com>2013-03-28 05:49:28 +0200
commit8e3a85ed6650a4dc77bc9861dba18b06eb5e4725 (patch)
tree0ae221f005cb9f319a6da40568e789d51866e719 /indra/newview/llimview.cpp
parente76a4eb7c51ab662d5f463737361cfdb1e82bf67 (diff)
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
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))
{