diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-18 18:44:21 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-18 18:44:21 -0400 |
| commit | 6fe98861335781973baf032bede81d4f2a55e965 (patch) | |
| tree | 76580fe706967dbe3590db291daddcbc4485bd26 /indra | |
| parent | ea9a71972dde8f61af06e92c3ed25e5ed5a27000 (diff) | |
SH-3980 FIX - fixed most cases of server-bake blurring by disabling caching of server bakes. A better solution is desirable, may not be for initial release
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/lltexturefetch.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 3502a641cf..38857abd47 100755 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -1178,7 +1178,9 @@ bool LLTextureFetchWorker::doWork(S32 param) offset, size, responder); mCacheReadTimer.reset(); } - else if ((mUrl.empty()||mFTType==FTT_SERVER_BAKE) && mFetcher->canLoadFromCache()) +/* SH-3980 - disabling caching of server bakes until we can fix the blurring problems */ +/* else if ((mUrl.empty()||mFTType==FTT_SERVER_BAKE) && mFetcher->canLoadFromCache()) */ + else if (mUrl.empty() && mFetcher->canLoadFromCache()) { setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority); // Set priority first since Responder may change it @@ -1294,10 +1296,12 @@ bool LLTextureFetchWorker::doWork(S32 param) mCanUseHTTP = false; } } +#if 0 /* SH-3980 - disabling caching of server bakes until we can fix the blurring problems */ if (mFTType == FTT_SERVER_BAKE) { mWriteToCacheState = CAN_WRITE; } +#endif if (mCanUseHTTP && !mUrl.empty()) { setState(WAIT_HTTP_RESOURCE); |