diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-05-04 10:37:32 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-05-04 10:37:32 -0700 |
| commit | 2a2930d24559c4d33470099807ade5f29d460210 (patch) | |
| tree | a087cdd0c3b18f5cec8381a0f0cc9ffc5a66e25a /indra/newview/llstartup.cpp | |
| parent | 268a7dbad8e277519a0e10da2cceee25994410b0 (diff) | |
DEV-45807 - worldmap doesn't work against non maingrid servers
The code used to retrieve the tiles for the world map was hardcoded
to retrieve the map tiles via s3. However, non-maingrid servers
do not necessarily publish their map tiles to s3.
The URL was in the form http://map.secondlife.com.s3.amazonaws.com/map-<level>-<x>-<y>-objects.jpg
This change removes the hard coding and places the default s3 URL in the settings.xml file via MapServerURL.
Login retrieves the specific grids URL via a map-server-url option. The url is still expected to
contain jpegs named like map-<level>-<x>-<y>-objects.jpg
CR: Karina Linden
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 8157e7fe8b..a84bb98a90 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -3030,6 +3030,13 @@ bool process_login_success_response() { gSavedSettings.setString("VoiceServerType", voice_config_info["VoiceServerType"].asString()); } + + // Request the map server url + std::string map_server_url = response["map-server-url"]; + if(!map_server_url.empty()) + { + gSavedSettings.setString("MapServerURL", map_server_url); + } // Default male and female avatars allowing the user to choose their avatar on first login. // These may be passed up by SLE to allow choice of enterprise avatars instead of the standard |