Fixed merge error in llviewertexture.cpp

2013-08-09 14:19:01 +02:00 · 2013-08-09 14:19:01 +02:00 · 55aecb81fd
parent 7527c74554
commit 55aecb81fd
1 changed files with 6 additions and 3 deletions
--- 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();