1 files changed, 24 insertions, 10 deletions

diff --git a/linden/indra/llrender/llimagegl.cpp b/linden/indra/llrender/llimagegl.cpp
index 5ea7322..8386e95 100644
--- a/linden/indra/llrender/llimagegl.cpp
+++ b/linden/indra/llrender/llimagegl.cpp
@@ -134,6 +134,15 @@ void LLImageGL::unbindTexture(S32 stage, LLGLenum bind_target)
         sCurrentBoundTextures[stage] = 0;
 }
 
+// static (duplicated for speed and to avoid GL_TEXTURE_2D default argument which requires GL header dependency)
+void LLImageGL::unbindTexture(S32 stage)
+{
+        glActiveTextureARB(GL_TEXTURE0_ARB + stage);
+        glClientActiveTextureARB(GL_TEXTURE0_ARB + stage);
+        glBindTexture(GL_TEXTURE_2D, 0);
+        sCurrentBoundTextures[stage] = 0;
+}
+
 // static
 void LLImageGL::updateStats(F32 current_time)
 {
@@ -390,13 +399,8 @@ BOOL LLImageGL::bindTextureInternal(const S32 stage) const
                 llwarns << "Trying to bind a texture while GL is disabled!" << llendl;
         }
 
-        stop_glerror();
-        
         glActiveTextureARB(GL_TEXTURE0_ARB + stage);
-        //glClientActiveTextureARB(GL_TEXTURE0_ARB + stage);
-        
-        stop_glerror();
-
+                
         if (sCurrentBoundTextures[stage] && sCurrentBoundTextures[stage] == mTexName)
         {
                 // already set!
@@ -411,7 +415,6 @@ BOOL LLImageGL::bindTextureInternal(const S32 stage) const
 
                 glBindTexture(mBindTarget, mTexName);
                 sCurrentBoundTextures[stage] = mTexName;
-                stop_glerror();
 
                 if (mLastBindTime != sLastFrameTime)
                 {
@@ -650,6 +653,7 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips)
                 }
                 mHasMipMaps = FALSE;
         }
+        glFlush();
         stop_glerror();
 }
 
@@ -664,6 +668,11 @@ BOOL LLImageGL::setSubImage(const U8* datap, S32 data_width, S32 data_height, S3
                 llwarns << "Setting subimage on image without GL texture" << llendl;
                 return FALSE;
         }
+        if (datap == NULL)
+        {
+                llwarns << "Setting subimage on image with NULL datap" << llendl;
+                return FALSE;
+        }
         
         if (x_pos == 0 && y_pos == 0 && width == getWidth() && height == getHeight())
         {
@@ -676,7 +685,9 @@ BOOL LLImageGL::setSubImage(const U8* datap, S32 data_width, S32 data_height, S3
                         dump();
                         llerrs << "setSubImage called with mipmapped image (not supported)" << llendl;
                 }
-                llassert(mCurrentDiscardLevel == 0);
+                llassert_always(mCurrentDiscardLevel == 0);
+                llassert_always(x_pos >= 0 && y_pos >= 0);
+                
                 if (((x_pos + width) > getWidth()) || 
                         (y_pos + height) > getHeight())
                 {
@@ -717,9 +728,12 @@ BOOL LLImageGL::setSubImage(const U8* datap, S32 data_width, S32 data_height, S3
 
                 datap += (y_pos * data_width + x_pos) * getComponents();
                 // Update the GL texture
-                llverify(bindTextureInternal(0));
+                BOOL res = bindTextureInternal(0);
+                if (!res) llerrs << "LLImageGL::setSubImage(): bindTexture failed" << llendl;
                 stop_glerror();
 
+                LLGLEnable tex( GL_TEXTURE_2D ); 
+
                 glTexSubImage2D(mTarget, 0, x_pos, y_pos, 
                                                 width, height, mFormatPrimary, mFormatType, datap);
                 stop_glerror();
@@ -733,7 +747,7 @@ BOOL LLImageGL::setSubImage(const U8* datap, S32 data_width, S32 data_height, S3
                 glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
                 stop_glerror();
         }
-        
+        glFlush();
         return TRUE;
 }