summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2014-04-16 13:21:06 -0500
committerDave Parks <davep@lindenlab.com>2014-04-16 13:21:06 -0500
commit816e8578f9b63640afde942df282ccf5ed1385a5 (patch)
tree8b229f6311f46b66ce1e4163776438e392593b23 /indra/newview/pipeline.cpp
parent678e8621794e774dc6ecc14b9fc3628583e4b935 (diff)
Backed out changeset: d0dfe3cda5b1
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rwxr-xr-xindra/newview/pipeline.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 0af1143ae8..5da8a78b1b 100755
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -4410,11 +4410,9 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
sUnderWaterRender = FALSE;
}
- if (LLViewerFetchedTexture::sDefaultImagep)
- {
- gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sDefaultImagep);
- LLViewerFetchedTexture::sDefaultImagep->setAddressMode(LLTexUnit::TAM_WRAP);
- }
+ gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sDefaultImagep);
+ LLViewerFetchedTexture::sDefaultImagep->setAddressMode(LLTexUnit::TAM_WRAP);
+
//////////////////////////////////////////////
//