diff options
| author | Richard Linden <none@none> | 2011-05-03 15:00:49 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-05-03 15:00:49 -0700 |
| commit | 29a2e3f2a4cf7c57adb7a6bfcd71ac960867288d (patch) | |
| tree | ab676a02a67a9838183bdd6239b41252fc34d058 /indra/newview/llimview.cpp | |
| parent | 315eee3a7c87c5ee2154013d3fa0356c80bfab2e (diff) | |
| parent | d5faa4f38d338777463b7ad6eb3239041d43fe28 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index ec3fe48151..38c5ba71bd 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -2696,10 +2696,10 @@ void LLIMMgr::inviteToSession( if (voice_invite) { - if ( // if we're rejecting all incoming call requests - gSavedSettings.getBOOL("VoiceCallsRejectAll") + if ( // if we are rejecting group calls + (gSavedSettings.getBOOL("VoiceCallsRejectGroup") && notify_box_type == "VoiceInviteGroup") || // or we're rejecting non-friend voice calls and this isn't a friend - || (gSavedSettings.getBOOL("VoiceCallsFriendsOnly") && (LLAvatarTracker::instance().getBuddyInfo(caller_id) == NULL)) + (gSavedSettings.getBOOL("VoiceCallsFriendsOnly") && (LLAvatarTracker::instance().getBuddyInfo(caller_id) == NULL)) ) { // silently decline the call |