diff options
author | Callum Prentice <callum@lindenlab.com> | 2021-04-29 13:38:16 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2021-04-29 13:38:16 -0700 |
commit | e3721fe66e2472eaf6bffd4bf4e2b9ec5edd2506 (patch) | |
tree | 32f6b6d4fabd10f447a0c950e0bafe7b573e4d9b /indra/newview/app_settings | |
parent | 0ccb0306da93fa279909f45131009e80687f2f3d (diff) | |
parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) |
Merge remote-tracking branch 'origin/master' into DRTVWR-533
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 5d2a678e7e..07f9511cf2 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> @@ -15205,7 +15205,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> |