diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:44:15 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:44:15 -0500 |
| commit | 562ed9c4d463ccb96dd4e6b23dff6ad6c845fc96 (patch) | |
| tree | e818a654c4c45cd9110164b932669cb5036c6e45 /indra/newview/llworldmipmap.cpp | |
| parent | 43659aac93ff5041bbf94bcaa66e88bc4b70a6cd (diff) | |
| parent | 05810f063dbe0ed87d03ea41c7d8fdc423945c6e (diff) | |
merge changes for storm-485
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 |