diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-08-17 12:33:12 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-08-17 12:33:12 -0400 |
| commit | 9de14fe45b6fc3b97e8c1ca91161e1fd5a9aab65 (patch) | |
| tree | 9f1b8bc6494139e812c5452bea18ceb7a3ba1834 /indra/newview | |
| parent | 9a6881bdedf530872c442bddbe0335ca475c736e (diff) | |
SH-3327 HTTP transfers not showing up in texture console 'net tot tex' value.
Dropped an argument during integration which made the total byte count read
lower than expected. Everything else is fine, however.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/lltexturefetch.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/lltexturefetch.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index efaeafbe78..718b15825d 100755 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -924,7 +924,7 @@ LLTextureFetchWorker::~LLTextureFetchWorker() mHttpBufferArray = NULL; } unlockWorkMutex(); // -Mw - mFetcher->removeFromHTTPQueue(mID); + mFetcher->removeFromHTTPQueue(mID, 0); mFetcher->removeHttpWaiter(mID); mFetcher->updateStateStats(mCacheReadCount, mCacheWriteCount, mResourceWaitCount); } @@ -1875,7 +1875,7 @@ void LLTextureFetchWorker::onCompleted(LLCore::HttpHandle handle, LLCore::HttpRe } } - mFetcher->removeFromHTTPQueue(mID); + mFetcher->removeFromHTTPQueue(mID, data_size); recordTextureDone(true); } // -Mw diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h index 115e471bc9..95ec8c65c0 100644 --- a/indra/newview/lltexturefetch.h +++ b/indra/newview/lltexturefetch.h @@ -226,7 +226,7 @@ protected: void addToHTTPQueue(const LLUUID& id); // Threads: T* - void removeFromHTTPQueue(const LLUUID& id, S32 received_size = 0); + void removeFromHTTPQueue(const LLUUID& id, S32 received_size); // Identical to @deleteRequest but with different arguments // (caller already has the worker pointer). |