diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2010-12-29 12:39:58 -0800 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2010-12-29 12:39:58 -0800 |
| commit | d12b7b347ad4094b96ba2a650ae86dfb9db2a893 (patch) | |
| tree | 1646c252edd36b31cf4ed3efaac0b91995f631e0 /indra/newview/llworldmipmap.cpp | |
| parent | 98b2f622b709fcacac32e8ad23b8da6479a28a87 (diff) | |
| parent | 087c105317058dc3a011c937a5aceaf87fdecc26 (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 |