Merge

2009-11-20 12:30:17 -08:00 · 2009-11-20 12:30:17 -08:00 · 555c1203ef
parent 280a321867 f80b5ea361
commit 555c1203ef
1 changed files with 10 additions and 1 deletions
--- 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"