diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-11-20 12:30:17 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-11-20 12:30:17 -0800 |
| commit | 555c1203ef9f8a9f135abcaf44801a60109c0b68 (patch) | |
| tree | 7bad7e39dd47e23afd4cba32492495e7beddd2f9 /indra | |
| parent | 280a321867d02c5c139a974dfc89035ffb8dfcd6 (diff) | |
| parent | f80b5ea3612fec02c9ed37e736774bde5ff43703 (diff) | |
Merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_privacy.xml | 11 |
1 files changed, 10 insertions, 1 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 1b9a99f90b..23832ba120 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -86,7 +86,16 @@ name="autoplay_enabled" top_pad="10" width="350" /> - <text + <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" follows="left|top" |