diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-01-05 10:37:00 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-01-05 10:37:00 -0500 |
| commit | a7db3b1786e8ac2fc1ee1da306689219ec6aae6a (patch) | |
| tree | 47330782030dbf0ad74984a3afb2db13b69ef660 /indra/newview/llworldmipmap.cpp | |
| parent | 3348a1ecc0854f249bf31c9dd65cc926b03c0c40 (diff) | |
| parent | 875d36b083582a2c5afdc8f515f203f331269312 (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 |