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/llworldmipmap.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/llworldmipmap.cpp')
| -rw-r--r-- | indra/newview/llworldmipmap.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llworldmipmap.cpp b/indra/newview/llworldmipmap.cpp index 1cdccd2baa..debd6b611f 100644 --- a/indra/newview/llworldmipmap.cpp +++ b/indra/newview/llworldmipmap.cpp @@ -33,6 +33,7 @@ #include "llviewerprecompiledheaders.h" #include "llworldmipmap.h" +#include "llviewercontrol.h" // LLControlGroup #include "llviewertexturelist.h" #include "math.h" // log() @@ -186,8 +187,8 @@ LLPointer<LLViewerFetchedTexture> LLWorldMipmap::getObjectsTile(U32 grid_x, U32 LLPointer<LLViewerFetchedTexture> LLWorldMipmap::loadObjectsTile(U32 grid_x, U32 grid_y, S32 level) { // Get the grid coordinates - std::string imageurl = llformat("http://map.secondlife.com.s3.amazonaws.com/map-%d-%d-%d-objects.jpg", - level, grid_x, grid_y); + std::string imageurl = gSavedSettings.getString("MapServerURL") + llformat("map-%d-%d-%d-objects.jpg", level, grid_x, grid_y); + // DO NOT COMMIT!! DEBUG ONLY!!! // Use a local jpeg for every tile to test map speed without S3 access |