diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-30 03:04:06 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-30 03:04:06 +0300 |
| commit | e00edbeb4a7edfe4f190ac7bf2197aa8240e50c6 (patch) | |
| tree | 25db350e573224fc2900c1e760f7cf429c599abe /indra/newview/app_settings | |
| parent | 3ad10e3075840b442f3a8f4593b4b4f10bad48e0 (diff) | |
| parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
Merge branch 'master' into DRTVWR-522-maint
# Conflicts:
# doc/contributions.txt
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index b7cf8ee821..bc07bb9e8e 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5937,7 +5937,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> @@ -15175,7 +15175,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> |