diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-05-29 20:22:45 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-05-29 20:22:45 +0300 |
| commit | 5287578d932f562e317bcdd409b9b30ecf43a403 (patch) | |
| tree | f5dcb5455bc6e5e2ecf7583497e57426a8de68a0 /indra/newview/llimview.cpp | |
| parent | 773a296383ebad29ad3f7a618405535e306d71b1 (diff) | |
CHUI-918 FIXED "Close all conversations" menu item is added to context menu.
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rwxr-xr-x | indra/newview/llimview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 892038722d..4614ce8fcb 100755 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -299,7 +299,8 @@ void notify_of_message(const LLSD& msg, bool is_dnd_msg) if ("openconversations" == user_preferences || ON_TOP == conversations_floater_status || ("toast" == user_preferences && ON_TOP != conversations_floater_status) - || ("flash" == user_preferences && CLOSED == conversations_floater_status) + || ("flash" == user_preferences && (CLOSED == conversations_floater_status + || NOT_ON_TOP == conversations_floater_status)) || is_dnd_msg) { if(!LLMuteList::getInstance()->isMuted(participant_id)) |