From e48af9ba0f40aa8096fddd28e4973d6853bc767e Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Wed, 21 Dec 2016 06:57:49 +0200
Subject: MAINT-7020 llui/llfloater.cpp should not access settings
---
indra/llui/llfloater.cpp | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
(limited to 'indra/llui/llfloater.cpp')
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 4f664a1ccc..3ece1c12bf 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -64,8 +64,6 @@
// use this to control "jumping" behavior when Ctrl-Tabbing
const S32 TABBED_FLOATER_OFFSET = 0;
-extern LLControlGroup gSavedSettings;
-
namespace LLInitParam
{
void TypeValues<LLFloaterEnums::EOpenPositioning>::declareValues()
@@ -653,13 +651,7 @@ void LLFloater::openFloater(const LLSD& key)
&& !getFloaterHost()
&& (!getVisible() || isMinimized()))
{
- //Don't play a sound for incoming voice call based upon chat preference setting
- bool playSound = !(getName() == "incoming call" && gSavedSettings.getBOOL("PlaySoundIncomingVoiceCall") == FALSE);
-
- if(playSound)
- {
- make_ui_sound("UISndWindowOpen");
- }
+ make_ui_sound("UISndWindowOpen");
}
//RN: for now, we don't allow rehosting from one multifloater to another
--
cgit v1.2.3