From 9de14fe45b6fc3b97e8c1ca91161e1fd5a9aab65 Mon Sep 17 00:00:00 2001
From: Monty Brandenberg <monty@lindenlab.com>
Date: Fri, 17 Aug 2012 12:33:12 -0400
Subject: [PATCH] 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.
---
indra/newview/lltexturefetch.cpp | 4 ++--
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 efaeafbe785..718b15825db 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 115e471bc9a..95ec8c65c03 100644
--- a/indra/newview/lltexturefetch.h
+++ b/indra/newview/lltexturefetch.h
@@ -226,7 +226,7 @@ class LLTextureFetch : public LLWorkerThread
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).
--
GitLab