diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 7e2e5c4bf5..e1559edcdd 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -2560,6 +2560,13 @@ void LLFloaterPreference::updateUISoundsControls() getChild("PlayModeUISndRestartOpenSim")->setVisible(TRUE); #endif getChild("UseLSLFlightAssist")->setValue((int)gSavedPerAccountSettings.getF32("UseLSLFlightAssist")); // Flight Assist combo box; Not sound-related, but better to place it here instead of creating whole new void + + // FIRE-9856: Mute sound effects disable plays sound from collisions and plays sound from gestures checkbox not disable after restart/relog + bool mute_sound_effects = gSavedSettings.getBOOL("MuteSounds"); + bool mute_all_sounds = gSavedSettings.getBOOL("MuteAudio"); + getChild("gesture_audio_play_btn")->setEnabled(!(mute_sound_effects || mute_all_sounds)); + getChild("collisions_audio_play_btn")->setEnabled(!(mute_sound_effects || mute_all_sounds)); + } // diff --git a/indra/newview/llpanelvolumepulldown.cpp b/indra/newview/llpanelvolumepulldown.cpp index d4a9f67c6c..3310d0b9f7 100755 --- a/indra/newview/llpanelvolumepulldown.cpp +++ b/indra/newview/llpanelvolumepulldown.cpp @@ -73,6 +73,13 @@ BOOL LLPanelVolumePulldown::postBuild() LLSliderCtrl* volslider = getChild( "System Volume" ); volslider->setValue(gSavedSettings.getF32("AudioLevelMaster")); + // FIRE-9856: Mute sound effects disable plays sound from collisions and plays sound from gestures checkbox not disable after restart/relog + bool mute_sound_effects = gSavedSettings.getBOOL("MuteSounds"); + bool mute_all_sounds = gSavedSettings.getBOOL("MuteAudio"); + getChild("gesture_audio_play_btn")->setEnabled(!(mute_sound_effects || mute_all_sounds)); + getChild("collisions_audio_play_btn")->setEnabled(!(mute_sound_effects || mute_all_sounds)); + // + return LLPanel::postBuild(); } diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 49248a047c..f075af2349 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -10506,8 +10506,16 @@ void volume_controls_on_click_set_sounds(const LLUICtrl* ctrl) { // Disable Enable gesture/collisions sounds checkbox if the master sound is disabled // or if sound effects are disabled. - volume_control_panel->getChild("gesture_audio_play_btn")->setEnabled(!gSavedSettings.getBOOL("MuteSounds")); - volume_control_panel->getChild("collisions_audio_play_btn")->setEnabled(!gSavedSettings.getBOOL("MuteSounds")); + + // FIRE-9856: Mute sound effects disable plays sound from collisions and plays sound from gestures checkbox not disable after restart/relog + // volume_control_panel->getChild("gesture_audio_play_btn")->setEnabled(!gSavedSettings.getBOOL("MuteSounds")); + // volume_control_panel->getChild("collisions_audio_play_btn")->setEnabled(!gSavedSettings.getBOOL("MuteSounds")); + bool mute_sound_effects = gSavedSettings.getBOOL("MuteSounds"); + bool mute_all_sounds = gSavedSettings.getBOOL("MuteAudio"); + volume_control_panel->getChild("gesture_audio_play_btn")->setEnabled(!(mute_sound_effects || mute_all_sounds)); + volume_control_panel->getChild("collisions_audio_play_btn")->setEnabled(!(mute_sound_effects || mute_all_sounds)); + // + } } diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index ab4cf25216..1e6d33ed56 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -68,7 +68,10 @@ left_pad="5" name="mute_audio" tab_stop="false" - width="16" /> + width="16"> + + + > + +