diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-07-12 13:59:26 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-07-12 13:59:26 -0400 |
| commit | b750a5afb7833d91aed88d9d1f75ee0b4bc2aa80 (patch) | |
| tree | ee54bbaed8f2f6016915cd3bb0506805e33179aa /indra/llrender/llrender.cpp | |
| parent | 543943279894d76662833c3b4e35efd7d09a91fc (diff) | |
| parent | 44c7c6feaa824f4049d326965cb066e76ebefee3 (diff) | |
merge
Diffstat (limited to 'indra/llrender/llrender.cpp')
| -rw-r--r-- | indra/llrender/llrender.cpp | 2 |
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); |