From d8e5d80cf0e6e1ef18f7eaafac4a02b9f364d344 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 7 Nov 2017 20:32:50 +0100
Subject: [PATCH] FIRE-21807: Playing sound for incoming IMs doesn't play
 anymore. Also play the correct sound as previously the sound for a new IM
 session has been used and not the one for an incoming voice call

---
 indra/llui/llfloater.cpp   | 6 +-----
 indra/newview/llimview.cpp | 3 ++-
 2 files changed, 3 insertions(+), 6 deletions(-)

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()))
 	{
 		// <FS:PP> 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);
 
-	// <FS:Ansariel> FIRE-7556: Configurable User Interface sounds; This is done in LLFloater::openFloater
+	// <FS:Ansariel> 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");
 	// </FS:Ansariel>
 
 	LLStringUtil::format_map_t args;