From 3e4f6d7d501a80020d7763a46e987f013a7010f7 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Sat, 4 Feb 2017 08:52:59 -0500
Subject: [PATCH] DRTVWR-418: Finish cleaning up merge from viewer-release.
---
indra/llui/llfloater.cpp | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index ccf666bd67e..3ece1c12bf6 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -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");
}
--
GitLab