diff options
| author | leyla_linden <none@none> | 2010-12-31 12:55:04 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2010-12-31 12:55:04 -0800 |
| commit | 350a736d37de282e1e3c22627400d957f0e00dc5 (patch) | |
| tree | 7427e593ce39ad2c50e1f217bad5b211a9eb3928 /indra/newview/llworldmipmap.cpp | |
| parent | d196348d0f4bd542eee3702329dab28952b8a5e5 (diff) | |
| parent | e3204165b9bb9b36cb11a8d0a4a4040634e707fc (diff) | |
Merge
Diffstat (limited to 'indra/newview/llworldmipmap.cpp')
| -rw-r--r-- | indra/newview/llworldmipmap.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llworldmipmap.cpp b/indra/newview/llworldmipmap.cpp index be8298daab..74ed844376 100644 --- a/indra/newview/llworldmipmap.cpp +++ b/indra/newview/llworldmipmap.cpp @@ -181,8 +181,7 @@ 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 = gSavedSettings.getString("MapServerURL") + llformat("map-%d-%d-%d-objects.jpg", level, grid_x, grid_y); - + std::string imageurl = gSavedSettings.getString("CurrentMapServerURL") + 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 |