diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-16 11:18:22 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-16 11:18:22 -0800 |
| commit | d6358e120fd5f6b6e987c05469c18b9ef186dba0 (patch) | |
| tree | 9455f1b9f640044988e5642b2d986aa4440457c9 /indra/newview/llimview.cpp | |
| parent | 568d818ffe214c358f92717ceb86dd20cb4aed26 (diff) | |
| parent | 4cf894dc77d31d029e77fa9f1212deaa75d9f844 (diff) | |
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 50e2b48f30..a38153c315 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -2495,7 +2495,11 @@ void LLIMMgr::addMessage( return; } - make_ui_sound("UISndNewIncomingIMSession"); + //Play sound for new conversations + if(gSavedSettings.getBOOL("PlaySoundNewConversation") == TRUE) + { + make_ui_sound("UISndNewIncomingIMSession"); + } } bool skip_message = (gSavedSettings.getBOOL("VoiceCallsFriendsOnly") && |