diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2017-02-13 20:15:26 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2017-02-13 20:15:26 +0200 |
| commit | 4524677fe526781e4cb9a987e9504cc3b2edd154 (patch) | |
| tree | 2c276bb18a9603b19d855ade36ddc9fa68043b1c /indra/newview/llviewermessage.cpp | |
| parent | 1c0a2f87790ca0df8af11f4e5d592723d22d14ea (diff) | |
MAINT-397 Teleport offers are not received after disabling "do not disturb" mode
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index d81cb804e4..579eacc315 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3038,16 +3038,17 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) { return; } - else if (is_do_not_disturb) - { - send_do_not_disturb_message(msg, from_id); - } else if (gSavedSettings.getBOOL("VoiceCallsFriendsOnly") && (LLAvatarTracker::instance().getBuddyInfo(from_id) == NULL)) { return; } else { + if (is_do_not_disturb) + { + send_do_not_disturb_message(msg, from_id); + } + LLVector3 pos, look_at; U64 region_handle(0); U8 region_access(SIM_ACCESS_MIN); |