diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-01-15 12:05:24 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-15 12:05:24 -0800 |
| commit | 3a707a1a69c44ccdbb819664d404ccc8d9716c28 (patch) | |
| tree | 6e7315a2611b36ffe193d3dc5a69298f9d920d2f /indra/newview/skins/default/xui | |
| parent | 0e62cc934caf205d416ab5cd633522958a96e056 (diff) | |
| parent | 315c381d804ccad4039e193ebd0cdc1b8d2ddec1 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_privacy.xml | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index 1c1e17eb5a..a8e24366f2 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -77,10 +77,23 @@ name="cookies_enabled" top_pad="10" width="350" /> - <check_box + <check_box + control_name="MediaEnabled" + height="16" + label="Media Enabled" + layout="topleft" + left="30" + name="media_enabled" + top_pad="10" + width="350"> + <check_box.commit_callback + function="Pref.MediaEnabled" /> + </check_box> + <check_box + enabled_control="MediaEnabled" control_name="ParcelMediaAutoPlayEnable" height="16" - label="Allow Media Autoplay" + label="Allow Media to auto-play" layout="topleft" left="30" name="autoplay_enabled" |