diff options
author | Oz Linden <oz@lindenlab.com> | 2012-05-25 14:22:33 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-05-25 14:22:33 -0400 |
commit | ee66cb3efccd6976c5a7725620956ea7030b7b57 (patch) | |
tree | 7ae469e4d2aac985589e7df902959b27c603b2ad /indra/llrender/llrender.cpp | |
parent | 5ef8372e433896be174d7123bd4663087601a0df (diff) | |
parent | 3e8dab32ee88e0a6fda51c218c61d718cf9dcafa (diff) |
merge back beta tags
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(); |