Second Life viewer sources 1.22.2-RC

2 files changed, 5 insertions, 1 deletions

diff --git a/linden/indra/llrender/llimagegl.cpp b/linden/indra/llrender/llimagegl.cpp
index d9b22c5..a41b931 100644
--- a/linden/indra/llrender/llimagegl.cpp
+++ b/linden/indra/llrender/llimagegl.cpp
@@ -154,7 +154,7 @@ void LLImageGL::destroyGL(BOOL save_state)
                 LLImageGL* glimage = *iter;
                 if (glimage->mTexName && glimage->mComponents)
                 {
-                        if (save_state)
+                        if (save_state && glimage->isInitialized())
                         {
                                 glimage->mSaveData = new LLImageRaw;
                                 glimage->readBackRaw(glimage->mCurrentDiscardLevel, glimage->mSaveData, false);
diff --git a/linden/indra/llrender/llrender.cpp b/linden/indra/llrender/llrender.cpp
index 80fed06..a15f44a 100644
--- a/linden/indra/llrender/llrender.cpp
+++ b/linden/indra/llrender/llrender.cpp
@@ -190,6 +190,10 @@ bool LLTexUnit::bind(const LLImageGL* texture)
         {
                 return texture->bindDefaultImage(mIndex);
         }
+        if (!texture->getTexName()) //if texture does not exist
+        {
+                return texture->bindDefaultImage(mIndex);
+        }
 
         // Disabled caching of binding state.
         if (texture != NULL)