diff options
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index e0f2a12a27..ccf666bd67 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -651,8 +651,6 @@ void LLFloater::openFloater(const LLSD& key) && !getFloaterHost() && (!getVisible() || isMinimized())) { - // gSavedSettings is a global instance of LLControlGroup, but since - // LLControlGroup is derived from LLInstanceTracker, we can also look // it up by name. LLControlGroup* gSavedSettingsp = LLControlGroup::getInstance("Global"); //Play a sound for incoming voice call based upon chat preference setting. @@ -662,11 +660,7 @@ void LLFloater::openFloater(const LLSD& key) bool playSound = (getName() != "incoming call" || (! gSavedSettingsp) || gSavedSettingsp->getBOOL("PlaySoundIncomingVoiceCall")); - - if(playSound) - { - make_ui_sound("UISndWindowOpen"); - } + make_ui_sound("UISndWindowOpen"); } //RN: for now, we don't allow rehosting from one multifloater to another |