diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-09-30 21:44:20 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-09-30 21:44:20 -0400 |
| commit | 57969e41db06cbc5c0f9ffdeafb7c21e55b2731d (patch) | |
| tree | ea54edd04380696ef3f83671204fdae2f7ae298e /indra/newview/llworldmap.cpp | |
| parent | c4c537e957458650a2948ffbd3a787f007d87f7a (diff) | |
| parent | eca30a22626b9a3e68e0e55f8da75614cd60d713 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/login-api/
Diffstat (limited to 'indra/newview/llworldmap.cpp')
| -rw-r--r-- | indra/newview/llworldmap.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llworldmap.cpp b/indra/newview/llworldmap.cpp index 700971dcc4..b8ecd9556f 100644 --- a/indra/newview/llworldmap.cpp +++ b/indra/newview/llworldmap.cpp @@ -635,7 +635,6 @@ void LLWorldMap::processMapBlockReply(LLMessageSystem* msg, void**) #ifdef IMMEDIATE_IMAGE_LOAD siminfo->mCurrentImage = LLViewerTextureManager::getFetchedTexture(siminfo->mMapImageID[LLWorldMap::getInstance()->mCurrentMap], MIPMAP_TRUE, FALSE, LLViewerTexture::LOD_TEXTURE); - gGL.getTexUnit(0)->bind(siminfo->mCurrentImage); siminfo->mCurrentImage->setAddressMode(LLTexUnit::TAM_CLAMP); #endif |