diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-28 10:35:22 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-28 10:35:22 -0400 |
| commit | 764d1e3cafa3e86f1f44a4c2bec0705879b9da38 (patch) | |
| tree | a2ac72c6625c729e73ae6077e790a104c2b598a3 /indra/llrender/llrender.cpp | |
| parent | ba90a4ec367d47a6876962d7d071cf4615289a11 (diff) | |
| parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) | |
merge up to 3.3.3-release
Diffstat (limited to 'indra/llrender/llrender.cpp')
| -rw-r--r-- | indra/llrender/llrender.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index b0ddacbb05..93bac4c779 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -246,14 +246,6 @@ bool LLTexUnit::bind(LLTexture* texture, bool for_rendering, bool forceBind) } //in audit, replace the selected texture by the default one. - if(gAuditTexture && for_rendering && LLImageGL::sCurTexPickSize > 0) - { - if(texture->getWidth() * texture->getHeight() == LLImageGL::sCurTexPickSize) - { - gl_tex->updateBindStats(gl_tex->mTextureMemory); - return bind(LLImageGL::sHighlightTexturep.get()); - } - } if ((mCurrTexture != gl_tex->getTexName()) || forceBind) { activate(); |