summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2017-02-04 08:52:59 -0500
committerNat Goodspeed <nat@lindenlab.com>2017-02-04 08:52:59 -0500
commit3e4f6d7d501a80020d7763a46e987f013a7010f7 (patch)
treef93911ae3c4239a8a1b1e3e3e09d455c03f9d182 /indra/llui
parent37974a2fa26ecdd1bbe91e3007ad4cf81af1f851 (diff)
DRTVWR-418: Finish cleaning up merge from viewer-release.
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llfloater.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index ccf666bd67..3ece1c12bf 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");
}