summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2011-07-11 13:52:46 -0400
committerprep <prep@lindenlab.com>2011-07-11 13:52:46 -0400
commitb905b231c93390fdfdccbc255fa1950a83d6eb75 (patch)
treeaa673669d27d95942e349462f7c88882d947d48d /indra/llrender
parent572a1734a5230bb4ecbc3cc1e5ff842e582e9b49 (diff)
parent80e60371f8be32719dd19467fd2def80e994aa2d (diff)
merge
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llrender.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index 6a3f186531..1d82dda30f 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -294,7 +294,7 @@ bool LLTexUnit::bind(LLImageGL* texture, bool for_rendering, bool forceBind)
glBindTexture(sGLTextureType[texture->getTarget()], mCurrTexture);
texture->updateBindStats(texture->mTextureMemory);
mHasMipMaps = texture->mHasMipMaps;
- if (mIndex == 0 && texture->mTexOptionsDirty)
+ if (texture->mTexOptionsDirty)
{
texture->mTexOptionsDirty = false;
setTextureAddressMode(texture->mAddressMode);