summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r--indra/newview/app_settings/settings.xml46
1 files changed, 34 insertions, 12 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 3b067b7a61..12da2c67a7 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1216,6 +1216,28 @@
<key>Value</key>
<string>https://accounts.secondlife.com/packs/floater?lang=[LANGUAGE]&amp;shortfall=[SHORTFALL]</string>
</map>
+ <key>PaymentMethodURL</key>
+ <map>
+ <key>Comment</key>
+ <string>URL for adding a payment method</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string>https://secondlife.com/my/lindex/buy.php?associate_for_viewer=1</string>
+ </map>
+ <key>PaymentMethodStagingURL</key>
+ <map>
+ <key>Comment</key>
+ <string>URL for adding a payment method on the Damballah</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string>https://secondlife-staging.com/my/lindex/buy.php?associate_for_viewer=1</string>
+ </map>
<key>EnableButtonFlashing</key>
<map>
<key>Comment</key>
@@ -13642,7 +13664,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
<key>PreferredBrowserBehavior</key>
<map>
@@ -15403,17 +15425,6 @@
<key>Value</key>
<integer>180</integer>
</map>
- <key>OSHibernationMode</key>
- <map>
- <key>Comment</key>
- <string>Whether to prevent OS from hibernating. 0 - can hibernate; 1 - can't hibernate, can turn screen off; 2 - can't hibernate, can't turn screen off </string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>HeightUnits</key>
<map>
<key>Comment</key>
@@ -16811,6 +16822,17 @@
<key>Value</key>
<integer>1000</integer>
</map>
+ <key>ValidateSculptyAreaRatio</key>
+ <map>
+ <key>Comment</key>
+ <string>Version information generated by running the viewer</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>VersionChannelName</key>
<map>
<key>Comment</key>