summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorEuclid Linden <euclid@lindenlab.com>2021-04-29 18:23:44 +0000
committerEuclid Linden <euclid@lindenlab.com>2021-04-29 18:23:44 +0000
commit5e757b2841941e8e5a9b918dbae4fd7b36a84896 (patch)
treedeee2618a9c33681e038845605db6719babd1d77 /indra/newview/app_settings
parent18316191cd7d1e1f8c3a4940eb5ed6cdf2695575 (diff)
parent2386125ae0db3218c620667b05449cd25ee05ad5 (diff)
Merged in DV525-merge-6.4.19 (pull request #559)
DRTVWR-525 merge up to 6.4.19
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 64ebfe86e1..6de3fd04e6 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5935,7 +5935,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>http://map.secondlife.com.s3.amazonaws.com/</string>
+ <string>https://map.secondlife.com/</string>
</map>
<key>CurrentMapServerURL</key>
<map>
@@ -15169,7 +15169,7 @@
<key>Value</key>
<real>1</real>
</map>
- <key>PoolSizeVAssetStorage</key>
+ <key>PoolSizeAssetStorage</key>
<map>
<key>Comment</key>
<string>Coroutine Pool size for AssetStorage requests</string>