From b9cc3a34da3aeb1a4df6d6b6c432e5201eb6e333 Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Tue, 10 Aug 2010 16:43:31 -0600
Subject: EXT-7399: FIXED: 2.0.2 with http textures loads textures slower than
 1.23.5

---
 indra/newview/lltexturefetch.cpp      |  8 ++++----
 indra/newview/llviewertexturelist.cpp | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 5e087f311c..846cba4a3b 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -855,9 +855,9 @@ bool LLTextureFetchWorker::doWork(S32 param)
 			// but probably not for Textures.
 			// Set the throttle to the entire bandwidth, assuming UDP packets will get priority
 			// when they are needed
-			F32 max_bandwidth = mFetcher->mMaxBandwidth;
-			if (mFetcher->isHTTPThrottled(mDesiredSize) ||
-				mFetcher->getTextureBandwidth() > max_bandwidth)
+			//F32 max_bandwidth = mFetcher->mMaxBandwidth;
+			if (mFetcher->isHTTPThrottled(mDesiredSize))// ||
+				//mFetcher->getTextureBandwidth() > max_bandwidth)
 			{
 				// Make normal priority and return (i.e. wait until there is room in the queue)
 				setPriority(LLWorkerThread::PRIORITY_NORMAL | mWorkPriority);
@@ -899,7 +899,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
 				mGetReason.clear();
 				LL_DEBUGS("Texture") << "HTTP GET: " << mID << " Offset: " << offset
 									 << " Bytes: " << mRequestedSize
-									 << " Bandwidth(kbps): " << mFetcher->getTextureBandwidth() << "/" << max_bandwidth
+									 << " Bandwidth(kbps): " << mFetcher->getTextureBandwidth() << "/" << mFetcher->mMaxBandwidth
 									 << LL_ENDL;
 				setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority);
 				mState = WAIT_HTTP_REQ;	
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 31f0998fab..02097ea06d 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -853,14 +853,14 @@ F32 LLViewerTextureList::updateImagesFetchTextures(F32 max_time)
 		}
 		min_count--;
 	}
-	if (fetch_count == 0)
-	{
-		gDebugTimers[0].pause();
-	}
-	else
-	{
-		gDebugTimers[0].unpause();
-	}
+	//if (fetch_count == 0)
+	//{
+	//	gDebugTimers[0].pause();
+	//}
+	//else
+	//{
+	//	gDebugTimers[0].unpause();
+	//}
 	return image_op_timer.getElapsedTimeF32();
 }
 
-- 
cgit v1.2.3