diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-04-29 13:45:15 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-04-29 13:45:15 -0700 |
| commit | 99b99a1b4a21758ef888b251d8f8bbf565f8b42e (patch) | |
| tree | 5c91eaa4a6dffd724cdb0cb8f4de8c11f82335a5 /indra/newview/app_settings | |
| parent | 0df59ff9e6e50237d36a976731e81c6e37e73933 (diff) | |
| parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
Clean up a merge conflict
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 b81e366b54..cbd33e9244 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5946,7 +5946,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> @@ -15158,7 +15158,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> |