diff options
| author | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2015-12-21 18:21:05 +0200 |
|---|---|---|
| committer | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2015-12-21 18:21:05 +0200 |
| commit | 7ce37f9910016f7225621df9e70dd2fd7c41725d (patch) | |
| tree | db09b96def05e74d4b93de43d442618a70a52ef1 /indra/newview/llviewermessage.cpp | |
| parent | cbdf791fb1634c3c42c1e24da4b99dfdc3251f26 (diff) | |
| parent | 5099d01b74cfdd4ba192844b9fb7c5d19c454a54 (diff) | |
Merged lindenlab/viewer-lion into default
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rwxr-xr-x | indra/newview/llviewermessage.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 6ba10373b9..49886b5e4f 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3061,6 +3061,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) { send_do_not_disturb_message(msg, from_id); } + else if (gSavedSettings.getBOOL("VoiceCallsFriendsOnly") && (LLAvatarTracker::instance().getBuddyInfo(from_id) == NULL)) + { + return; + } else { LLVector3 pos, look_at; |