diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-09-26 18:08:24 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-09-26 18:08:24 -0400 |
| commit | bc4444cd78067cbf11d3ffb210375a31a33f96bd (patch) | |
| tree | d9b8e78db237869e630fec6c71335d1294cec101 /indra/newview/llworldmap.cpp | |
| parent | 8ddc0c0ac43e9d10bf0262cd1ab3c0e79808fc14 (diff) | |
| parent | 09bf3c1fec107e9e66514837d208ef62a6b67b91 (diff) | |
Merge into viewer/viewer-20 yesterday's lindenlab/svn-imports-viewer-20
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 |