livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHUI-895 FIXED Show toasts for messages if conversation is collapsed to Input bar(regardless of other prefs).

meow-7.2.2
Mnikolenko ProductEngine 2013-03-27 15:22:25 +02:00
parent 9adb105999
commit 9e180d9c8f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llimview.cpp
View File

@ -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