Merge remote-tracking branch 'shyotl/master'

2013-07-12 07:23:27 +02:00
parent 6a7f7bf4de ccff8475c1
commit 77f77b03b0
10 changed files with 84 additions and 23 deletions
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10432,6 +10432,17 @@ This should be as low as possible, but too low may break functionality</string>
      <key>Value</key>
      <integer>0</integer>
    </map>
+    <key>PrimMediaAutoPlayEnable</key>
+    <map>
+      <key>Comment</key>
+      <string>Auto play prim media when available</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
    <key>PerAccountSettingsFile</key>
    <map>
      <key>Comment</key>