Merge remote-tracking branch 'melanie_t/master'

2013-04-16 12:53:37 +02:00
parent c1d5f33a4c ab2f06d64e
commit 97809b3a22
16 changed files with 408 additions and 38 deletions
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -314,6 +314,17 @@
 			<key>Value</key>
 			<integer>0</integer>
 		</map>
+    <key>EveryoneExport</key>
+    <map>
+      <key>Comment</key>
+      <string>Whether content you upload has exportability permission by default</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
    <key>RLVaLoginLastLocation</key>
    <map>
      <key>Comment</key>