diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-19 17:13:21 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-19 17:13:21 +0200 |
| commit | 82de841c52357642d30b6d89b11da079f9c0f5d1 (patch) | |
| tree | 8ed3ec82392b6afd2ddf2023035fdfa45cd74c0b /indra/newview/skins/default/xui/en/panel_preferences_privacy.xml | |
| parent | 4610e911c959cdd21728822ae80b9e717ccd3012 (diff) | |
| parent | 00c05a885fb1cbee967065798f57d74bf47f2478 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_preferences_privacy.xml')
| -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" |