From 6db6d81b0a90fe7b48a3ccf64ba768e5772397c8 Mon Sep 17 00:00:00 2001 From: Eric Tulla Date: Thu, 5 Mar 2009 00:29:27 +0000 Subject: Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272). No conflicts in the merge. Result of: svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 . --- indra/llrender/llimagegl.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'indra/llrender/llimagegl.cpp') diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 307147798e..c784019cd9 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -510,10 +510,8 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips) is_compressed = true; } - { // LLFastTimer t2(LLFastTimer::FTM_TEMP2); - llverify(gGL.getTexUnit(0)->bind(this)); - } + gGL.getTexUnit(0)->bind(this); if (mUseMipMaps) { -- cgit v1.2.3