diff options
| author | Richard Linden <none@none> | 2012-10-19 19:35:01 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-10-19 19:35:01 -0700 |
| commit | 176ffa54b44f2ef73f23e3252dd439f52fab3265 (patch) | |
| tree | a261deb62bf993388805146119c15fadef917732 /indra/newview/llviewerstats.cpp | |
| parent | bd52d784f904cb0b46be5826f6c7df31b214fc09 (diff) | |
SH-3405 WIP convert existing stats to lltrace system
finished most of conversion of llviewerassetstats
ported some param block fixes from viewer-chui
converted viewer asset stats to param block format
Diffstat (limited to 'indra/newview/llviewerstats.cpp')
| -rwxr-xr-x | indra/newview/llviewerstats.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index 03cc9b12e3..04b0c30b40 100755 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -128,7 +128,8 @@ SimMeasurement<> SIM_TIME_DILATION("simtimedilation", "", LL_SIM_STAT_TIME_DIL SIM_PHYSICS_PINNED_TASKS("physicspinnedtasks", "", LL_SIM_STAT_PHYSICS_PINNED_TASKS), SIM_PHYSICS_LOD_TASKS("physicslodtasks", "", LL_SIM_STAT_PHYSICS_LOD_TASKS); -LLTrace::Measurement<> NUM_IMAGES("numimagesstat"), +LLTrace::Measurement<> FPS_SAMPLE("fpssample"), + NUM_IMAGES("numimagesstat"), NUM_RAW_IMAGES("numrawimagesstat"), NUM_OBJECTS("numobjectsstat"), NUM_ACTIVE_OBJECTS("numactiveobjectsstat"), @@ -343,6 +344,7 @@ void update_statistics() } LLStatViewer::FPS.add(1); + LLStatViewer::FPS_SAMPLE.sample(LLTrace::get_frame_recording().getTotalRecording().getPerSec(LLStatViewer::FPS)); F32 layer_bits = (F32)(gVLManager.getLandBits() + gVLManager.getWindBits() + gVLManager.getCloudBits()); LLStatViewer::LAYERS_KBIT.add<LLTrace::Bits>(layer_bits); LLStatViewer::OBJECT_KBIT.add(gObjectData); |