diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-02-02 15:49:16 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-02-02 15:49:16 -0500 |
| commit | 1925fd2b8b9216e5d9388e6a0c077c99aa782cad (patch) | |
| tree | 2507c9889eb825302f7c3f1650b85e6208b04e4e /indra/newview/llimview.cpp | |
| parent | 7f544db197fcaa8a697ee9d9694d11b297a20266 (diff) | |
| parent | 080744d8990e6b18a80858803a20a5ec87020d82 (diff) | |
merge changes for 5.0.1-release
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 951389b856..2405c3a1a3 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -2354,7 +2354,13 @@ void LLIncomingCallDialog::onAvatarNameCache(const LLUUID& agent_id, void LLIncomingCallDialog::onOpen(const LLSD& key) { LLCallDialog::onOpen(key); - make_ui_sound("UISndStartIM"); + + if (gSavedSettings.getBOOL("PlaySoundIncomingVoiceCall")) + { + // play a sound for incoming voice call if respective property is set + make_ui_sound("UISndStartIM"); + } + LLStringUtil::format_map_t args; LLGroupData data; // if it's a group call, retrieve group name to use it in question |