diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-12-22 00:00:58 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-12-22 00:00:58 +0200 |
| commit | 29ff62c05d5f16660a4e7837ca5d12c87e77818b (patch) | |
| tree | e1db4de723041db2dd55f94a90b43818a83c7e27 /indra/llui | |
| parent | c496269f59128128e02ebe82251f09ab169788fe (diff) | |
| parent | e48af9ba0f40aa8096fddd28e4973d6853bc767e (diff) | |
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfloater.cpp | 10 |
1 files changed, 1 insertions, 9 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 |