From 5dca8bb6d3fadb96cf73f70d0daeb59ad30f1dd6 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 2 May 2013 15:15:31 +0200
Subject: [PATCH] Don't let the fast cache choke image processing

---
 indra/newview/llviewertexturelist.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index adc644336c..68877af5a8 100755
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -680,7 +680,11 @@ void LLViewerTextureList::updateImages(F32 max_time)
 	{
 		//loading from fast cache 
 		LLFastTimer t(FTM_FAST_CACHE_IMAGE_FETCH);
-		max_time -= updateImagesLoadingFastCache(max_time);
+		// <FS:Ansariel> Don't let the fast cache choke image processing
+		//max_time -= updateImagesLoadingFastCache(max_time);
+		F32 fastcache_time = updateImagesLoadingFastCache(max_time / 3);
+		max_time = llmax(max_time * 2/3, max_time - fastcache_time); // at least 66% for update fetch & create
+		// </FS:Ansariel>
 	}
 
 	{