summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2021-04-30 03:05:06 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2021-04-30 03:05:06 +0300
commit58b4afa0ba83891482851b67965d1b1dd5b7de76 (patch)
tree6b3d4e1ed0b6c13fb3acb838214a70b5a2ef3fa4 /indra/newview/app_settings
parentc8977fd904df10f225915ac5527d279440356257 (diff)
parentce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff)
Merge branch 'master' into DRTVWR-530-maint
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 5502b3db55..49c2d7b4e4 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>
@@ -15191,7 +15191,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>