From 816e8578f9b63640afde942df282ccf5ed1385a5 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 16 Apr 2014 13:21:06 -0500
Subject: Backed out changeset: d0dfe3cda5b1

---
 indra/llappearance/lltexlayer.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'indra/llappearance/lltexlayer.cpp')

diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp
index 4cf82a3740..63d01999f0 100644
--- a/indra/llappearance/lltexlayer.cpp
+++ b/indra/llappearance/lltexlayer.cpp
@@ -1973,10 +1973,7 @@ LLGLTexture* LLTexLayerStaticImageList::getTexture(const std::string& file_name,
 	}
 	else
 	{
-		if (!gTextureManagerBridgep)
-		{
-			return LLPointer<LLGLTexture>();
-		}
+		llassert(gTextureManagerBridgep);
 		tex = gTextureManagerBridgep->getLocalTexture( FALSE );
 		LLPointer<LLImageRaw> image_raw = new LLImageRaw;
 		if( loadImageRaw( file_name, image_raw ) )
-- 
cgit v1.2.3