Second Life viewer sources 1.22.3-RC

3 files changed, 20 insertions, 17 deletions

diff --git a/linden/indra/llrender/llimagegl.cpp b/linden/indra/llrender/llimagegl.cpp
index a41b931..9a392d7 100644
--- a/linden/indra/llrender/llimagegl.cpp
+++ b/linden/indra/llrender/llimagegl.cpp
@@ -748,7 +748,7 @@ BOOL LLImageGL::setSubImage(const LLImageRaw* imageraw, S32 x_pos, S32 y_pos, S3
 // Copy sub image from frame buffer
 BOOL LLImageGL::setSubImageFromFrameBuffer(S32 fb_x, S32 fb_y, S32 x_pos, S32 y_pos, S32 width, S32 height)
 {
-        if (gGL.getTexUnit(0)->bind(this))
+        if (gGL.getTexUnit(0)->bind(this, true))
         {
                 glCopyTexSubImage2D(GL_TEXTURE_2D, 0, fb_x, fb_y, x_pos, y_pos, width, height);
                 mInitialized = true;
diff --git a/linden/indra/llrender/llrender.cpp b/linden/indra/llrender/llrender.cpp
index a15f44a..fcd76d4 100644
--- a/linden/indra/llrender/llrender.cpp
+++ b/linden/indra/llrender/llrender.cpp
@@ -175,7 +175,7 @@ void LLTexUnit::disable(void)
         }
 }
 
-bool LLTexUnit::bind(const LLImageGL* texture)
+bool LLTexUnit::bind(const LLImageGL* texture, bool forceBind)
 {
         if (mIndex < 0) return false;
 
@@ -183,29 +183,27 @@ bool LLTexUnit::bind(const LLImageGL* texture)
 
         if (texture == NULL)
         {
-                return texture->bindError(mIndex);
+                llwarns << "NULL LLTexUnit::bind texture" << llendl;
+                return false;
         }
 
-        if (!texture->isInitialized())
+        if (!texture->isInitialized() && !forceBind)
         {
                 return texture->bindDefaultImage(mIndex);
         }
+
         if (!texture->getTexName()) //if texture does not exist
         {
                 return texture->bindDefaultImage(mIndex);
         }
 
         // Disabled caching of binding state.
-        if (texture != NULL)
-        {
-                activate();
-                enable(texture->getTarget());
-                mCurrTexture = texture->getTexName();
-                glBindTexture(sGLTextureType[texture->getTarget()], mCurrTexture);
-                texture->updateBindStats();
-                return true;
-        }
-        return false;
+        activate();
+        enable(texture->getTarget());
+        mCurrTexture = texture->getTexName();
+        glBindTexture(sGLTextureType[texture->getTarget()], mCurrTexture);
+        texture->updateBindStats();
+        return true;
 }
 
 bool LLTexUnit::bind(LLCubeMap* cubeMap)
diff --git a/linden/indra/llrender/llrender.h b/linden/indra/llrender/llrender.h
index 8c648f3..7dcb504 100644
--- a/linden/indra/llrender/llrender.h
+++ b/linden/indra/llrender/llrender.h
@@ -135,12 +135,17 @@ public:
         // Disables the current texture unit
         void disable(void);     
         
-        // Binds the LLImageGL to this texture unit (automatically enables the unit for the LLImageGL's texture type)
-        bool bind(const LLImageGL* texture);
-        // Binds a cubemap to this texture unit (automatically enables the texture unit for cubemaps)
+        // Binds the LLImageGL to this texture unit 
+        // (automatically enables the unit for the LLImageGL's texture type)
+        bool bind(const LLImageGL* texture, bool forceBind = false);
+
+        // Binds a cubemap to this texture unit 
+        // (automatically enables the texture unit for cubemaps)
         bool bind(LLCubeMap* cubeMap);
+
         // Binds a render target to this texture unit (automatically enables the texture unit for the RT's texture type)
         bool bind(LLRenderTarget * renderTarget, bool bindDepth = false);
+
         // Manually binds a texture to the texture unit (automatically enables the tex unit for the given texture type)
         bool bindManual(eTextureType type, U32 texture);