Second Life viewer sources 1.22.3-RC

1 files changed, 11 insertions, 13 deletions

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)