diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-05-11 14:37:25 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-05-11 14:37:25 -0700 |
| commit | 0ebf74a2295533ac60227c26e52c74d83865c84d (patch) | |
| tree | fc0e9fb79864674efe4affcf13831731df0be11b /indra/newview/llworldmipmap.cpp | |
| parent | ae2821458cfc336a0c2422657ae3ca7cac05a071 (diff) | |
| parent | 37dc96ccdde6263188ffc4f620492a4bb2017761 (diff) | |
Merge
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 |