diff options
author | Dave Parks <davep@lindenlab.com> | 2012-06-28 13:50:35 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-06-28 13:50:35 -0500 |
commit | db5d1b851a0d808dc1e8b0896fad734c2c54a03f (patch) | |
tree | ebe50ddb5e1aa700d54f50bbc1ab4b435462b85e /indra/llrender/llrender.cpp | |
parent | 1d8f117069945499ac297ef13eb6a916a2b96d72 (diff) | |
parent | ed72fd0ae98671f1cfce3c975b93e1f760fc40f0 (diff) |
merge
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 b45ff1a6b7..348c1eb1b7 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(); |