diff options
| author | prep linden <prep@lindenlab.com> | 2010-11-19 16:17:26 -0500 |
|---|---|---|
| committer | prep linden <prep@lindenlab.com> | 2010-11-19 16:17:26 -0500 |
| commit | 6b0d10975b0ec00b374554ecd3b211e0d966272b (patch) | |
| tree | 680f653b05fa0a12c8957c5f334e55e864e6af5a /indra/newview/llstartup.cpp | |
| parent | 292941ac947d0ef07431a3addcfbe72287031cc4 (diff) | |
| parent | b5585a2d551190a5445581ced09be5fe906a0b53 (diff) | |
merge
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llstartup.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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()) { |