Stats floater fix up.
Add '(UDP)' after Objects, to show that this is UDP bandwidth. Do not add the received HTTP texture bytes to gTextureList.sTextureBits, making it (and the 'UDP Textures' graph) indeed pure UDP.
This commit is contained in:
@@ -263,7 +263,7 @@ void LLFloaterStats::buildStats()
|
||||
stat_barp->mTickSpacing = 128.f;
|
||||
stat_barp->mLabelSpacing = 256.f;
|
||||
|
||||
stat_barp = net_statviewp->addStat("Objects", &(LLViewerStats::getInstance()->mObjectKBitStat), "DebugStatModeObjects");
|
||||
stat_barp = net_statviewp->addStat("Objects (UDP)", &(LLViewerStats::getInstance()->mObjectKBitStat), "DebugStatModeObjects");
|
||||
stat_barp->setUnitLabel(" kbps");
|
||||
stat_barp->mMinBar = 0.f;
|
||||
stat_barp->mMaxBar = 1024.f;
|
||||
|
||||
@@ -2034,7 +2034,6 @@ LLTextureFetch::LLTextureFetch(LLTextureCache* cache, LLImageDecodeThread* image
|
||||
mBadPacketCount(0),
|
||||
mTextureCache(cache),
|
||||
mImageDecodeThread(imagedecodethread),
|
||||
mHTTPTextureBits(0),
|
||||
mTotalHTTPRequests(0),
|
||||
mQAMode(qa_mode),
|
||||
mTotalCacheReadCount(0U),
|
||||
@@ -2186,7 +2185,6 @@ void LLTextureFetch::removeFromHTTPQueue(const LLUUID& id, S32 received_size)
|
||||
{
|
||||
LLMutexLock lock(&mNetworkQueueMutex);
|
||||
mHTTPTextureQueue.erase(id);
|
||||
mHTTPTextureBits += received_size * 8; // Approximate - does not include header bits
|
||||
}
|
||||
|
||||
void LLTextureFetch::deleteRequest(const LLUUID& id, bool cancel)
|
||||
@@ -2399,15 +2397,6 @@ void LLTextureFetch::commonUpdate()
|
||||
//virtual
|
||||
S32 LLTextureFetch::update(F32 max_time_ms)
|
||||
{
|
||||
{
|
||||
mNetworkQueueMutex.lock() ;
|
||||
|
||||
gTextureList.sTextureBits += mHTTPTextureBits ;
|
||||
mHTTPTextureBits = 0 ;
|
||||
|
||||
mNetworkQueueMutex.unlock() ;
|
||||
}
|
||||
|
||||
S32 res = LLWorkerThread::update(max_time_ms);
|
||||
|
||||
if (!mDebugPause)
|
||||
|
||||
@@ -163,8 +163,6 @@ private:
|
||||
cancel_queue_t mCancelQueue;
|
||||
LLTextureInfo mTextureInfo;
|
||||
|
||||
U32 mHTTPTextureBits;
|
||||
|
||||
//debug use
|
||||
U32 mTotalHTTPRequests ;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user