diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-06-14 19:51:27 +0300 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-06-14 19:51:27 +0300 |
| commit | 636a0f002db89b8001aeb1982f860ea1eda7dabb (patch) | |
| tree | 5cddf95b5945a8134ddbc6104563998a7fd528b9 /indra/newview/llimview.cpp | |
| parent | 882ab04ef3e412716f0f034e348007b5f3016f3c (diff) | |
| parent | 2a93df9888c8a755b51a5a9e39e089550ca9d1f2 (diff) | |
merge
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rwxr-xr-x | indra/newview/llimview.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index ecd22a5c1b..b43e9296f9 100755 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -311,10 +311,9 @@ void notify_of_message(const LLSD& msg, bool is_dnd_msg) } else { - if ((is_dnd_msg && (ON_TOP == conversations_floater_status || + if (is_dnd_msg && (ON_TOP == conversations_floater_status || NOT_ON_TOP == conversations_floater_status || CLOSED == conversations_floater_status)) - || CLOSED == conversations_floater_status) { im_box->highlightConversationItemWidget(session_id, true); } |