diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-06-04 20:24:10 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-06-04 20:24:10 +0300 |
| commit | 0bcb1db3ea8056e96b6cb087758e6ee57bc122a3 (patch) | |
| tree | b0f731b90b668d7edfe89a7acebbb93a6ec857d9 /indra/newview | |
| parent | 4965a0de28ad91da099bcd3a981675cfe7d7fc23 (diff) | |
CHUI-972 FIXED Don't show voice request in DND mode, even if session with participant exists.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llimview.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 4614ce8fcb..ba96c5ee24 100755 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -3043,10 +3043,9 @@ void LLIMMgr::inviteToSession( { bool isRejectGroupCall = (gSavedSettings.getBOOL("VoiceCallsRejectGroup") && (notify_box_type == "VoiceInviteGroup")); bool isRejectNonFriendCall = (gSavedSettings.getBOOL("VoiceCallsFriendsOnly") && (LLAvatarTracker::instance().getBuddyInfo(caller_id) == NULL)); - bool isRejectDoNotDisturb = (gAgent.isDoNotDisturb() && !hasSession(session_id)); - if (isRejectGroupCall || isRejectNonFriendCall || isRejectDoNotDisturb) + if (isRejectGroupCall || isRejectNonFriendCall || gAgent.isDoNotDisturb()) { - if (isRejectDoNotDisturb && !isRejectGroupCall && !isRejectNonFriendCall) + if (gAgent.isDoNotDisturb() && !isRejectGroupCall && !isRejectNonFriendCall) { LLSD args; addSystemMessage(session_id, "you_auto_rejected_call", args); |