From b1a280841e1823a19658923a8eefeb67d1d70735 Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Sat, 3 Oct 2009 00:23:01 +0000
Subject: fix for DEV-40559: viewer crash when media texture appears while
 parcel media is loading.

---
 indra/newview/llface.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview/llface.cpp')

diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index a5b0b05603..b0ae13348b 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -272,12 +272,12 @@ void LLFace::setTexture(LLViewerTexture* tex)
 		removeAtlas() ;
 	}	
 	
-	mTexture = tex ;
-
-	if(mTexture.notNull())
+	if(tex)
 	{
-		mTexture->addFace(this) ;
-	} 
+		tex->addFace(this) ;
+	}
+
+	mTexture = tex ;
 }
 
 void LLFace::switchTexture(LLViewerTexture* new_texture)
-- 
cgit v1.2.3