diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-04-29 18:23:44 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-04-29 18:23:44 +0000 |
| commit | 5e757b2841941e8e5a9b918dbae4fd7b36a84896 (patch) | |
| tree | deee2618a9c33681e038845605db6719babd1d77 /indra/newview/llstartup.cpp | |
| parent | 18316191cd7d1e1f8c3a4940eb5ed6cdf2695575 (diff) | |
| parent | 2386125ae0db3218c620667b05449cd25ee05ad5 (diff) | |
Merged in DV525-merge-6.4.19 (pull request #559)
DRTVWR-525 merge up to 6.4.19
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 929e8c3dae..3fb79e4739 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -3543,11 +3543,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()) { |