diff options
author | Merov Linden <merov@lindenlab.com> | 2010-11-04 14:30:32 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-11-04 14:30:32 -0700 |
commit | f7af29ab40c2405504969a453eba3919be1af5c5 (patch) | |
tree | f31f6d31582e8ff89c769334cb70e1076c887ef7 /indra/newview/lltexturefetch.cpp | |
parent | c2500f808cd8e1957054d5ec1b3555e30698c2b3 (diff) | |
parent | 889aff8d87a4dbf3ca43c43bdeed825f67fd5e60 (diff) |
merge with viewer-development
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
-rw-r--r-- | indra/newview/lltexturefetch.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index b2c2aab388..13fd51f473 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -299,6 +299,7 @@ public: { static LLCachedControl<bool> log_to_viewer_log(gSavedSettings,"LogTextureDownloadsToViewerLog"); static LLCachedControl<bool> log_to_sim(gSavedSettings,"LogTextureDownloadsToSimulator"); + static LLCachedControl<bool> log_texture_traffic(gSavedSettings,"LogTextureNetworkTraffic") ; if (log_to_viewer_log || log_to_sim) { @@ -332,6 +333,16 @@ public: } S32 data_size = worker->callbackHttpGet(channels, buffer, partial, success); + + if(log_texture_traffic && data_size > 0) + { + LLViewerTexture* tex = LLViewerTextureManager::findTexture(mID) ; + if(tex) + { + gTotalTextureBytesPerBoostLevel[tex->getBoostLevel()] += data_size ; + } + } + mFetcher->removeFromHTTPQueue(mID, data_size); } else |