diff options
| author | bea@american.lindenlab.com <bea@american.lindenlab.com> | 2009-12-03 08:49:08 -0800 |
|---|---|---|
| committer | bea@american.lindenlab.com <bea@american.lindenlab.com> | 2009-12-03 08:49:08 -0800 |
| commit | 9b17e6710b713fa12f6db7d6f51d97e4052a0835 (patch) | |
| tree | 81ad36d56262c60525176394f162ba49da978e7a /indra/newview/skins | |
| parent | db4ea92fa8fb3a0c20194824ecd59f9ef0d8b5f2 (diff) | |
| parent | 469f17f9c21062d545a78e08dedcdc2bc978c7b6 (diff) | |
merge
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_privacy.xml | 11 |
1 files changed, 1 insertions, 10 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 23832ba120..29e9b476eb 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -78,7 +78,7 @@ top_pad="10" width="350" /> <check_box - control_name="AutoPlayMedia" + control_name="ParcelMediaAutoPlayEnable" height="16" label="Allow Media Autoplay" layout="topleft" @@ -86,15 +86,6 @@ name="autoplay_enabled" top_pad="10" width="350" /> - <check_box - control_name="ParcelMediaAutoPlayEnable" - height="16" - label="Automatically Play Parcel Media" - layout="topleft" - left="30" - name="parcel_autoplay_enabled" - top_pad="10" - width="350" /> <text type="string" length="1" |