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/llviewercamera.cpp | |
| parent | dcf4e489213d6e954a34fbb3c5c96e94645b868b (diff) | |
| parent | e52e5fe5be0d2f4e0e8ded445bd18c0985ef968a (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llviewercamera.cpp')
| -rw-r--r-- | indra/newview/llviewercamera.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewercamera.cpp b/indra/newview/llviewercamera.cpp index f74897daa7..6e0a2c88a8 100644 --- a/indra/newview/llviewercamera.cpp +++ b/indra/newview/llviewercamera.cpp @@ -54,8 +54,8 @@ // System includes #include <iomanip> // for setprecision -LLTrace::Count<> LLViewerCamera::sVelocityStat("camera_velocity"); -LLTrace::Count<> LLViewerCamera::sAngularVelocityStat("camera_angular_velocity"); +LLTrace::CountStatHandle<> LLViewerCamera::sVelocityStat("camera_velocity"); +LLTrace::CountStatHandle<> LLViewerCamera::sAngularVelocityStat("camera_angular_velocity"); U32 LLViewerCamera::sCurCameraID = LLViewerCamera::CAMERA_WORLD; |