summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-02-03 14:09:02 -0800
committerMerov Linden <merov@lindenlab.com>2011-02-03 14:09:02 -0800
commite82fb8c7b90c0f5038c38a1aaf4882718433bfd6 (patch)
tree1c017c4ddd57d5dd5a951999aca856bb81caa651 /indra/newview/skins/default/xui/en
parent3feb97487a6330080f6278f01e5d26dad0196d77 (diff)
parentc07c6cf8f4979a3374a09cec12e92df619ffd501 (diff)
STORM-513 : pull into viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_sound.xml12
1 files changed, 9 insertions, 3 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 f0ce8b849a..26af8dc29d 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -198,9 +198,12 @@
label="Enabled"
layout="topleft"
left_pad="5"
- name="music_enabled"
+ name="enable_music"
top_delta="2"
- width="350"/>
+ width="350">
+ <check_box.commit_callback
+ function="Pref.updateMediaAutoPlayCheckbox"/>
+ </check_box>
<slider
control_name="AudioLevelMedia"
disabled_control="MuteAudio"
@@ -245,7 +248,10 @@
top_delta="2"
left_pad="5"
name="enable_media"
- width="110"/>
+ width="110">
+ <check_box.commit_callback
+ function="Pref.updateMediaAutoPlayCheckbox"/>
+ </check_box>
<slider
control_name="AudioLevelVoice"
disabled_control="MuteAudio"