diff options
| author | Aaron Stone <stone@lindenlab.com> | 2011-07-12 15:52:14 -0700 |
|---|---|---|
| committer | Aaron Stone <stone@lindenlab.com> | 2011-07-12 15:52:14 -0700 |
| commit | 450b64981c878f558b597a2855bc18318555a532 (patch) | |
| tree | d84598caf68980baa4eb3f058ada5b3ffb1c4dff /indra/llrender | |
| parent | 42daa3497b6626cbb5f32ba54162558cd025069b (diff) | |
| parent | 44c7c6feaa824f4049d326965cb066e76ebefee3 (diff) | |
Merge for STORM-1482
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); |