diff options
| author | Richard Linden <none@none> | 2013-03-06 11:08:49 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-03-06 11:08:49 -0800 |
| commit | 4a5f14afc987b645c68705b0313aebbc3ba1d811 (patch) | |
| tree | be3c96145b3be558b0131978a7c53c3aece15852 /indra/newview/llviewerwindow.cpp | |
| parent | a6bb68b6e530df91d03abfc062c700ebc4e856aa (diff) | |
| parent | f07b9c2c69f1f6882dcf249aacf33cdfacf878ab (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rwxr-xr-x | indra/newview/llviewerwindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 70792cd0a0..0bd0b2a769 100755 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -248,7 +248,7 @@ std::string LLViewerWindow::sSnapshotDir; std::string LLViewerWindow::sMovieBaseName; -LLTrace::Measurement<> LLViewerWindow::sMouseVelocityStat("Mouse Velocity"); +LLTrace::MeasurementStatHandle<> LLViewerWindow::sMouseVelocityStat("Mouse Velocity"); class RecordToChatConsole : public LLError::Recorder, public LLSingleton<RecordToChatConsole> @@ -2186,8 +2186,8 @@ void LLViewerWindow::reshape(S32 width, S32 height) } } - LLStatViewer::WINDOW_WIDTH.sample((F64)width); - LLStatViewer::WINDOW_HEIGHT.sample((F64)height); + sample(LLStatViewer::WINDOW_WIDTH, width); + sample(LLStatViewer::WINDOW_HEIGHT, height); LLLayoutStack::updateClass(); } @@ -3250,7 +3250,7 @@ void LLViewerWindow::updateMouseDelta() mouse_vel.setVec((F32) dx, (F32) dy); } - sMouseVelocityStat.sample(mouse_vel.magVec()); + sample(sMouseVelocityStat, mouse_vel.magVec()); } void LLViewerWindow::updateKeyboardFocus() |