diff options
| author | Jonathan Yap <none@none> | 2011-06-12 16:00:33 -0400 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2011-06-12 16:00:33 -0400 |
| commit | ac504815137ec01767717e7c1a4c419a995f629c (patch) | |
| tree | 48f34f243169b5c6e0c96aec68470c9050e1bc83 /indra/newview/skins/default/xui | |
| parent | 12d9d1d3ef76518171ae87aae2467593218f8413 (diff) | |
STORM-787 Mute Gestures Button
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_sound.xml | 22 |
1 files changed, 18 insertions, 4 deletions
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 91fe6f544c..1bdd2ccefb 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -123,8 +123,8 @@ function="Pref.setControlFalse" parameter="MuteAmbient" /> </slider> - <button - control_name="MuteAmbient" + <button + control_name="MuteAmbient" disabled_control="MuteAudio" follows="top|left" height="16" @@ -157,7 +157,7 @@ function="Pref.setControlFalse" parameter="MuteSounds" /> </slider> - <button + <button control_name="MuteSounds" disabled_control="MuteAudio" follows="top|left" @@ -169,7 +169,10 @@ left_pad="5" name="mute_audio" tab_stop="false" - width="16" /> + width="16"> + <button.commit_callback + function="Pref.SetSounds"/> + </button> <slider control_name="AudioLevelMusic" disabled_control="MuteAudio" @@ -312,6 +315,17 @@ width="110"/> <!-- --> <check_box + name="gesture_audio_play_btn" + control_name="EnableGestureSounds" + disabled_control="MuteAudio" + value="true" + follows="left|bottom|right" + height="15" + tool_tip="Check this to hear sounds from gestures" + label="Enable sounds from gestures" + top_pad="1" + left="25"/> + <check_box name="media_auto_play_btn" control_name="ParcelMediaAutoPlayEnable" enabled_control="AudioStreamingMedia" |