diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-08-10 16:43:31 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-08-10 16:43:31 -0600 |
| commit | b9cc3a34da3aeb1a4df6d6b6c432e5201eb6e333 (patch) | |
| tree | 47bca0a0f333d43af4e69e5539024bd8c00578f5 /indra/newview/lltexturefetch.cpp | |
| parent | f2fd3b8a2f0d14d91b419d68b5214c78f01bd3c7 (diff) | |
EXT-7399: FIXED: 2.0.2 with http textures loads textures slower than 1.23.5
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rw-r--r-- | indra/newview/lltexturefetch.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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; |