diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index aaf5178209..2fa00a1d5f 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -696,11 +696,7 @@ void LLFloater::openFloater(const LLSD& key) && (!getVisible() || isMinimized())) { // UI Sounds connection - if (getName() == "incoming call") - { - make_ui_sound("UISndIncomingVoiceCall"); - } - else if (getName() == "script_floater") + if (getName() == "script_floater") { make_ui_sound("UISndScriptFloaterOpen"); } diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 6517aa18a3..1125e8bb07 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -2643,12 +2643,13 @@ void LLIncomingCallDialog::onOpen(const LLSD& key) { LLCallDialog::onOpen(key); - // FIRE-7556: Configurable User Interface sounds; This is done in LLFloater::openFloater + // FIRE-7556: Configurable User Interface sounds; This is controlled in llui.cpp //if (gSavedSettings.getBOOL("PlaySoundIncomingVoiceCall")) //{ // // play a sound for incoming voice call if respective property is set // make_ui_sound("UISndStartIM"); //} + make_ui_sound("UISndIncomingVoiceCall"); // LLStringUtil::format_map_t args;