diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-08-19 19:09:53 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-08-19 19:09:53 +0300 |
| commit | 18428e768d53f97694104d49da8ef4287568edda (patch) | |
| tree | 0f8cba467cd092cde59a278ad7992f55d377c3da | |
| parent | 5a77098523767aa8eb48c9c88068e1c38da0f958 (diff) | |
SL-12905 Use TLS-enabled map server
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/llstartup.cpp | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a00aa86d78..a18492c554 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5924,7 +5924,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> diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 6d20dcf188..9c3ad0bb28 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -3519,11 +3519,6 @@ bool process_login_success_response() } // Request the map server url - // Non-agni grids have a different default location. - if (!LLGridManager::getInstance()->isInProductionGrid()) - { - gSavedSettings.setString("MapServerURL", "http://test.map.secondlife.com.s3.amazonaws.com/"); - } std::string map_server_url = response["map-server-url"]; if(!map_server_url.empty()) { |