summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-07-09 11:05:29 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-07-09 11:05:29 -0400
commit961d5b1d65fffff7075d0afbce003586b1f3b197 (patch)
treed72caf02576506883be2638a458616bd8b5ea292 /indra/llrender
parentdd6547a55e02a4340cb178c72acff1216a56f84c (diff)
parentb40a44d24d7e59d9102f603a28ab329046e34b5d (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);