diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-11-12 17:31:27 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-11-12 17:31:27 -0500 |
| commit | d9c0e0ba74d3f042ae7f3a7310f0c0bf23e6eaa9 (patch) | |
| tree | 7ff6286063a2bd5c03a5294b375ee990f7d7b950 /indra | |
| parent | 853e90ea8014ac9c4fb02cb2d2eeffa8ab473f85 (diff) | |
SH-275 FIX: non-production grids now default to different source of map tiles
Diffstat (limited to 'indra')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/app_settings/settings.xml | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llstartup.cpp | 5 |
2 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 5ac076ae1b..5ac076ae1b 100644..100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 5ee4599200..230dfaea51 100644..100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -3071,6 +3071,11 @@ 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()) { |