From 55aecb81fd5618c80c329a5e402ef8a11571f9ea Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 9 Aug 2013 14:19:01 +0200
Subject: [PATCH] Fixed merge error in llviewertexture.cpp

---
 indra/newview/llviewertexture.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index d906622ad7..88ba5b5781 100755
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -2096,10 +2096,13 @@ bool LLViewerFetchedTexture::updateFetch()
 void LLViewerFetchedTexture::clearFetchedResults()
 {
 	// <FS:Ansariel> For texture refresh
-	//llassert_always(!mNeedsCreateTexture && !mIsFetching);
 	mIsMissingAsset = FALSE;
-	// </FS:Ansariel>
-	
+
+	if(mNeedsCreateTexture || mIsFetching)
+	{
+		return ;
+	}
+
 	cleanup();
 	destroyGLTexture();