diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-22 06:03:42 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-22 06:03:42 -0400 |
| commit | 7637acf76e6a1170508e8bddd381c426d219b1ee (patch) | |
| tree | c48b5ea58fda587a103278860b943122f6ce8fae /indra/llrender/llrender.cpp | |
| parent | 6525fc4a4fc09e02c4fa709e0cbba4aa8d7d25ae (diff) | |
| parent | c4dfdcb338aaeeb4e3adc4e1aef4f5b190ef5c57 (diff) | |
merge changes for DRTVWR-149
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(); |