diff options
| author | Richard Linden <none@none> | 2013-03-06 11:27:12 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-03-06 11:27:12 -0800 |
| commit | 9a81945eac31f41848cd48a5ba18dee4949f2d03 (patch) | |
| tree | 2a0a6644adfa609651ce9c42a808ce67bef9d0b3 /indra/newview/llviewerdisplay.cpp | |
| parent | dcf4e489213d6e954a34fbb3c5c96e94645b868b (diff) | |
| parent | e52e5fe5be0d2f4e0e8ded445bd18c0985ef968a (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 4 |
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)); } |