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 +---------
indra/newview/llimview.cpp | 8 +++++++-
indra/newview/skins/default/xui/en/floater_outgoing_call.xml | 1 +
3 files changed, 9 insertions(+), 10 deletions(-)
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
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 951389b856..2405c3a1a3 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -2354,7 +2354,13 @@ void LLIncomingCallDialog::onAvatarNameCache(const LLUUID& agent_id,
void LLIncomingCallDialog::onOpen(const LLSD& key)
{
LLCallDialog::onOpen(key);
- make_ui_sound("UISndStartIM");
+
+ if (gSavedSettings.getBOOL("PlaySoundIncomingVoiceCall"))
+ {
+ // play a sound for incoming voice call if respective property is set
+ make_ui_sound("UISndStartIM");
+ }
+
LLStringUtil::format_map_t args;
LLGroupData data;
// if it's a group call, retrieve group name to use it in question
diff --git a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
index ffbb6aa28b..d714cc613e 100644
--- a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
@@ -8,6 +8,7 @@
layout="topleft"
name="outgoing call"
help_topic="outgoing_call"
+ sound_flags="0"
save_dock_state="true"
title="CALLING"
width="410">
--
cgit v1.2.3