CHUI-806 (IM floater is not become as a top while geting message with enabled 'Open conversation window' option)

meow-7.2.2
mberezhnoy 2013-03-04 17:11:14 +02:00
parent e42e6bc68a
commit 23ca3a1f2c
1 changed files with 3 additions and 2 deletions

View File

@ -273,7 +273,7 @@ void on_new_message(const LLSD& msg)
}
}
else if("openconversations" == action && !session_floater_is_open)
else if("openconversations" == action)
{
//User is not focused on conversation containing the message
if(session_floater_not_focused)
@ -291,7 +291,8 @@ void on_new_message(const LLSD& msg)
//useMostItrusiveIMNotification will be called to notify user a message exists
if(session_id.notNull()
&& participant_id.notNull()
&& gAgent.isDoNotDisturb())
&& gAgent.isDoNotDisturb()
&& !session_floater_is_open)
{
LLAvatarNameCache::get(participant_id, boost::bind(&on_avatar_name_cache_toast, _1, _2, msg));
}