diff options
| author | Don Kjer <don@lindenlab.com> | 2011-07-08 18:25:07 -0700 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-07-08 18:25:07 -0700 |
| commit | b9d6b5ef9a9797709397be983ec74c30cd1e0ce2 (patch) | |
| tree | 9886deac5d65ee1873e8c75ed2af62943c872f63 /indra/llrender | |
| parent | 615cc856a8abf44f62c58962f8b53178f9708ee3 (diff) | |
| parent | ccb3ad90001c2b19cbd690d67317651ee0182f42 (diff) | |
Merge viewer-development -> mesh-development
Diffstat (limited to 'indra/llrender')
| -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); |