summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-15 11:57:13 -0400
committerOz Linden <oz@lindenlab.com>2011-06-15 11:57:13 -0400
commit81afbd5b293e80248daddb51e7985e474abe9d45 (patch)
tree5876324036ffa822e3792ab8c1c83f984349515c /indra/newview/skins
parent83cb59e45b56cd6b3f42de760bc64a8203913251 (diff)
parent0c8b3ea7448a9da069d20fdf3d48a6feec7eb33f (diff)
merge changes for storm-787
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_sound.xml23
1 files changed, 18 insertions, 5 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..1745c1e4b0 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"
@@ -332,7 +335,17 @@
label="Play media attached to other avatars"
left="25"
width="230"/>
-
+ <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="Play sounds from gestures"
+ top_pad="1"
+ left="25"/>
<text
type="string"
length="1"