livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Ansariel 2017-11-07 20:32:50 +01:00
parent 9f3a00d11f
commit d8e5d80cf0
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llui/llfloater.cpp
View File

@ -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");
}

3
indra/newview/llimview.cpp
View File

@ -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;