DRTVWR-418: Finish cleaning up merge from viewer-release.

meow-7.2.2
Nat Goodspeed 2017-02-04 08:52:59 -05:00
parent 37974a2fa2
commit 3e4f6d7d50
1 changed files with 0 additions and 9 deletions

View File

@ -651,15 +651,6 @@ void LLFloater::openFloater(const LLSD& key)
&& !getFloaterHost()
&& (!getVisible() || isMinimized()))
{
// it up by name.
LLControlGroup* gSavedSettingsp = LLControlGroup::getInstance("Global");
//Play a sound for incoming voice call based upon chat preference setting.
//If it's not an incoming call, play it anyway.
//If we can't find gSavedSettings, play it anyway.
//If the setting is ON, play it anyway.
bool playSound = (getName() != "incoming call" ||
(! gSavedSettingsp) ||
gSavedSettingsp->getBOOL("PlaySoundIncomingVoiceCall"));
make_ui_sound("UISndWindowOpen");
}