diff options
| author | Richard Linden <none@none> | 2013-01-17 20:04:39 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-17 20:04:39 -0800 |
| commit | 0825eb0207a51e0f747fc04e7c9b6bd6a76e86fe (patch) | |
| tree | c87749c8e9c98c695aa6daae9a6660582580ae4e /indra/newview/lltextureview.cpp | |
| parent | a0413bdef71d804bbf008cf319f54a5a47efb29c (diff) | |
| parent | 670d03ceb83b92c9bb98d10bb37fba6f75971a2f (diff) | |
merge
Diffstat (limited to 'indra/newview/lltextureview.cpp')
| -rwxr-xr-x | indra/newview/lltextureview.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp index 1d54e50bb9..7a6351c880 100755 --- a/indra/newview/lltextureview.cpp +++ b/indra/newview/lltextureview.cpp @@ -49,6 +49,8 @@ #include "llviewertexturelist.h" #include "llvovolume.h" #include "llviewerstats.h" +#include "llworld.h" +#include "llviewerobjectlist.h" // For avatar texture view #include "llvoavatarself.h" @@ -517,6 +519,9 @@ void LLGLTexMemBar::draw() LLUnit<LLUnits::Bytes, F32> total_texture_downloaded = gTotalTextureData; LLUnit<LLUnits::Bytes, F32> total_object_downloaded = gTotalObjectData; U32 total_http_requests = LLAppViewer::getTextureFetch()->getTotalNumHTTPRequests() ; + U32 total_active_cached_objects = LLWorld::getInstance()->getNumOfActiveCachedObjects(); + U32 total_objects = gObjectList.getNumObjects(); + //---------------------------------------------------------------------------- LLGLSUIDefault gls_ui; LLColor4 text_color(1.f, 1.f, 1.f, 0.75f); @@ -549,9 +554,11 @@ void LLGLTexMemBar::draw() U32 cache_read(0U), cache_write(0U), res_wait(0U); LLAppViewer::getTextureFetch()->getStateStats(&cache_read, &cache_write, &res_wait); - text = llformat("Net Tot Tex: %.1f MB Tot Obj: %.1f MB Tot Htp: %d Cread: %u Cwrite: %u Rwait: %u", + text = llformat("Net Tot Tex: %.1f MB Tot Obj: %.1f MB #Objs/#Cached: %d/%d Tot Htp: %d Cread: %u Cwrite: %u Rwait: %u", total_texture_downloaded.value(), total_object_downloaded.value(), + total_objects, + total_active_cached_objects, total_http_requests, cache_read, cache_write, |