Merge downstream code

1 files changed, 4 insertions, 14 deletions

diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp
index d7ecacf2e6..c3ec234223 100755
--- a/indra/newview/lldrawpoolterrain.cpp
+++ b/indra/newview/lldrawpoolterrain.cpp
@@ -88,11 +88,8 @@ LLDrawPoolTerrain::LLDrawPoolTerrain(LLViewerTexture *texturep) :
 	//gGL.getTexUnit(0)->bind(m2DAlphaRampImagep.get());
 	m2DAlphaRampImagep->setAddressMode(LLTexUnit::TAM_CLAMP);
 	
-	if (mTexturep)
-	{
-		mTexturep->setBoostLevel(LLGLTexture::BOOST_TERRAIN);
-	}
-
+	mTexturep->setBoostLevel(LLGLTexture::BOOST_TERRAIN);
+	
 	//gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 }
 
@@ -854,18 +851,11 @@ void LLDrawPoolTerrain::renderSimple()
 	// Pass 1/1
 
 	// Stage 0: Base terrain texture pass
-	if (mTexturep)
-	{
-		mTexturep->addTextureStats(1024.f*1024.f);
-	}
+	mTexturep->addTextureStats(1024.f*1024.f);
 
 	gGL.getTexUnit(0)->activate();
 	gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
-
-	if (mTexturep)
-	{
-		gGL.getTexUnit(0)->bind(mTexturep);
-	}
+	gGL.getTexUnit(0)->bind(mTexturep);
 	
 	LLVector3 origin_agent = mDrawFace[0]->getDrawable()->getVObj()->getRegion()->getOriginAgent();
 	F32 tscale = 1.f/256.f;