diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-19 17:14:18 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-19 17:14:18 -0800 |
| commit | aba409f24f7ec7d74d545b0309340c98854b7217 (patch) | |
| tree | 976051dcbce5e1af3673faba6d7ea3283c705a79 /indra/newview/llimview.cpp | |
| parent | 48a683af70fe359f4b4b6fdf6486208fc34dc2a9 (diff) | |
CHUI-495: Ensuring that a user in do-not-disturb mode can receive voice calls from current conversations.
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index e2b678626b..b5dc4a7967 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -2808,7 +2808,7 @@ 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(); + bool isRejectDoNotDisturb = (gAgent.isDoNotDisturb() && !hasSession(session_id)); if (isRejectGroupCall || isRejectNonFriendCall || isRejectDoNotDisturb) { if (isRejectDoNotDisturb && !isRejectGroupCall && !isRejectNonFriendCall) |