svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/

merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.

1 files changed, 1 insertions, 7 deletions

diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index 433be9e2eb..c7068133d2 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -187,17 +187,11 @@ bool LLTexUnit::bind(const LLImageGL* texture, bool forceBind)
 		llwarns << "NULL LLTexUnit::bind texture" << llendl;
 		return false;
 	}
-
-	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.
 	activate();
 	enable(texture->getTarget());