summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerdisplay.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-03-06 11:08:49 -0800
committerRichard Linden <none@none>2013-03-06 11:08:49 -0800
commit4a5f14afc987b645c68705b0313aebbc3ba1d811 (patch)
treebe3c96145b3be558b0131978a7c53c3aece15852 /indra/newview/llviewerdisplay.cpp
parenta6bb68b6e530df91d03abfc062c700ebc4e856aa (diff)
parentf07b9c2c69f1f6882dcf249aacf33cdfacf878ab (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
-rw-r--r--indra/newview/llviewerdisplay.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index fe83f80caa..2aec25b7aa 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -749,8 +749,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
{
LLFastTimer t(FTM_IMAGE_UPDATE_CLASS);
- LLTrace::Count<>* velocity_stat = LLViewerCamera::getVelocityStat();
- LLTrace::Count<>* angular_velocity_stat = LLViewerCamera::getAngularVelocityStat();
+ LLTrace::CountStatHandle<>* velocity_stat = LLViewerCamera::getVelocityStat();
+ LLTrace::CountStatHandle<>* angular_velocity_stat = LLViewerCamera::getAngularVelocityStat();
LLViewerTexture::updateClass(LLTrace::get_frame_recording().getPeriodMeanPerSec(*velocity_stat),
LLTrace::get_frame_recording().getPeriodMeanPerSec(*angular_velocity_stat));
}