aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lldrawpoolterrain.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2010-02-09 21:11:42 -0600
committerJacek Antonelli2010-02-16 18:50:15 -0600
commite6247fbe78c4d3dacb74f3b2359aba2b6538133b (patch)
tree10c42d670a2c635b4339f7f68809c221756774f8 /linden/indra/newview/lldrawpoolterrain.cpp
parentPorted some cURL and HTTP-related changes from Snowglobe. (diff)
downloadmeta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.zip
meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.gz
meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.bz2
meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.xz
Ported many texture engine changes from Snowglobe.
Diffstat (limited to 'linden/indra/newview/lldrawpoolterrain.cpp')
-rw-r--r--linden/indra/newview/lldrawpoolterrain.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/lldrawpoolterrain.cpp b/linden/indra/newview/lldrawpoolterrain.cpp
index 2c644b0..cac5162 100644
--- a/linden/indra/newview/lldrawpoolterrain.cpp
+++ b/linden/indra/newview/lldrawpoolterrain.cpp
@@ -83,7 +83,7 @@ LLDrawPoolTerrain::LLDrawPoolTerrain(LLViewerImage *texturep) :
83 gGL.getTexUnit(0)->bind(m2DAlphaRampImagep.get()); 83 gGL.getTexUnit(0)->bind(m2DAlphaRampImagep.get());
84 m2DAlphaRampImagep->setAddressMode(LLTexUnit::TAM_CLAMP); 84 m2DAlphaRampImagep->setAddressMode(LLTexUnit::TAM_CLAMP);
85 85
86 mTexturep->setBoostLevel(LLViewerImage::BOOST_TERRAIN); 86 mTexturep->setBoostLevel(LLViewerImageBoostLevel::BOOST_TERRAIN);
87 87
88 gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); 88 gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
89} 89}
@@ -170,7 +170,7 @@ void LLDrawPoolTerrain::render(S32 pass)
170 LLVLComposition *compp = regionp->getComposition(); 170 LLVLComposition *compp = regionp->getComposition();
171 for (S32 i = 0; i < 4; i++) 171 for (S32 i = 0; i < 4; i++)
172 { 172 {
173 compp->mDetailTextures[i]->setBoostLevel(LLViewerImage::BOOST_TERRAIN); 173 compp->mDetailTextures[i]->setBoostLevel(LLViewerImageBoostLevel::BOOST_TERRAIN);
174 compp->mDetailTextures[i]->addTextureStats(1024.f*1024.f); // assume large pixel area 174 compp->mDetailTextures[i]->addTextureStats(1024.f*1024.f); // assume large pixel area
175 } 175 }
176 176