diff options
| author | Richard Linden <none@none> | 2012-11-07 00:38:21 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-11-07 00:38:21 -0800 |
| commit | 860ff2f7e2a7fe932dfb7c148f0dbc0067018038 (patch) | |
| tree | f6356524dd5d2cecccae3934771a3f81ba31c90a /indra/newview/llviewerstats.cpp | |
| parent | 0007114cf5a60779319ab8cbd0a23a0d462b8010 (diff) | |
SH-3499 WIP Ensure asset stats output is correct
fixed trace data gathering and routing from background thread
simplified slave->master thread communication (eliminated redundant recording and proxy object)
improved performance of fast timer data gathering (slow iterators)
Diffstat (limited to 'indra/newview/llviewerstats.cpp')
| -rwxr-xr-x | indra/newview/llviewerstats.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index a42368cec4..317fe5eaf8 100755 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -349,7 +349,10 @@ void update_statistics() } LLStatViewer::FPS.add(1); - LLStatViewer::FPS_SAMPLE.sample(LLTrace::get_frame_recording().getTotalRecording().getPerSec(LLStatViewer::FPS)); + if (LLTrace::get_frame_recording().getTotalRecording().getSampleCount(LLStatViewer::FPS)) + { + 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); |