diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-06-07 18:10:32 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-06-07 18:10:32 -0400 |
| commit | cab68bb04ed3c3734b48c703a43d41f231911647 (patch) | |
| tree | e6e2a44af2ef157d95ff61eca10c6ed7df5524f2 | |
| parent | 196e1d46bdc8b35b2e79d8a9d6a693ebeeeb19d3 (diff) | |
First efforts at getting the texture cache working. This is
now avoiding doing HTTP fetches for read data. Not certain it's
completely correct but the difference is already significant.
| -rw-r--r-- | indra/newview/lltexturefetch.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 23232cb590..92b847345d 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -1584,7 +1584,7 @@ bool LLTextureFetchWorker::doWork(S32 param) if (mState == DONE) { - if (mDecodedDiscard >= 0 && mDesiredDiscard < mDecodedDiscard) + if (mDecodedDiscard > 0 && mDesiredDiscard < mDecodedDiscard) { // More data was requested, return to INIT mState = INIT; @@ -1883,7 +1883,7 @@ S32 LLTextureFetchWorker::callbackHttpGet(LLCore::HttpResponse * response, llassert_always(mDecodeHandle == 0); mFormattedImage = NULL; // discard any previous data we had } - else if (data_size < mRequestedSize && mRequestedDiscard == 0) + else if (data_size < mRequestedSize /*&& mRequestedDiscard == 0*/) { // *FIXME: I think we can treat this as complete regardless // of requested discard level. Revisit this... |