Ported many texture engine changes from Snowglobe.

1 files changed, 2 insertions, 3 deletions

diff --git a/linden/indra/newview/lldrawpool.cpp b/linden/indra/newview/lldrawpool.cpp
index 9f05ce3..e1bf1ed 100644
--- a/linden/indra/newview/lldrawpool.cpp
+++ b/linden/indra/newview/lldrawpool.cpp
@@ -279,7 +279,7 @@ S32 LLFacePool::drawLoopSetTex(face_array_t& face_list, S32 stage)
                          iter != face_list.end(); iter++)
                 {
                         LLFace *facep = *iter;
-                        gGL.getTexUnit(stage)->bind(facep->getTexture());
+                        gGL.getTexUnit(stage)->bind(facep->getTexture(), TRUE);
                         gGL.getTexUnit(0)->activate();
                         res += facep->renderIndexed();
                 }
@@ -481,14 +481,13 @@ void LLRenderPass::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture)
         {
                 if (params.mTexture.notNull())
                 {
-                        gGL.getTexUnit(0)->bind(params.mTexture.get());
+                        gGL.getTexUnit(0)->bind(params.mTexture.get(), TRUE);
                         if (params.mTextureMatrix)
                         {
                                 glMatrixMode(GL_TEXTURE);
                                 glLoadMatrixf((GLfloat*) params.mTextureMatrix->mMatrix);
                                 gPipeline.mTextureMatrixOps++;
                         }
-                        params.mTexture->addTextureStats(params.mVSize);
                 }
                 else
                 {