diff options
author | Merov Linden <merov@lindenlab.com> | 2010-12-28 13:19:43 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-12-28 13:19:43 -0800 |
commit | 5b52a801c6dd31bf6eabd5e995a74dd96866223c (patch) | |
tree | b782a5c719998a368cff244e669df1fcd2a5152e /indra/newview/llworldmipmap.cpp | |
parent | cc11129afb3e79b7034059e6a09ec698584befa6 (diff) | |
parent | f8325ac588641d1f65a3c452b775a42efbe84069 (diff) |
STORM-805 : pull into viewer-development
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 |