diff options
author | skolb <none@none> | 2009-10-23 15:29:00 -0700 |
---|---|---|
committer | skolb <none@none> | 2009-10-23 15:29:00 -0700 |
commit | 913786a62b2b8d8e6d9c483ea805a21e694fd818 (patch) | |
tree | c7a2b1f7bcffe7262f549b062493908e03674446 /indra/newview/skins/default/xui/en | |
parent | 2438a9168b117dcabf5e5819f93e08a874735a26 (diff) |
DEV-41787 Media Auto Play controls were removed from prefs. Also made auto play override prim settings.
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_privacy.xml | 18 |
1 files changed, 14 insertions, 4 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 c4dc8834db..ce7939c00f 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,19 @@ name="cookies_enabled" top_pad="10" width="350" /> + <check_box + control_name="AutoPlayMedia" + height="16" + label="Allow Media Autoplay" + layout="topleft" + left="30" + name="autoplay_enabled" + top_pad="10" + width="350" /> <text - type="string" - length="1" - follows="left|top" + type="string" + length="1" + follows="left|top" height="10" layout="topleft" left="30" @@ -88,8 +97,9 @@ top_pad="10" width="350"> Logs: - </text> + </text> <check_box + enabled="false" control_name="LogInstantMessages" height="16" |