diff options
author | Richard Linden <none@none> | 2013-04-12 11:53:54 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-04-12 11:53:54 -0700 |
commit | 8db22a591645a3a7c3308827ca819bc2415692d8 (patch) | |
tree | 72a48ab9da03f06c1725318c6a46986cd52d0ad5 /indra/newview/tests/llviewerassetstats_test.cpp | |
parent | f964c8faa84cfa95bbf73552e99a2d0b80f7bee2 (diff) | |
parent | 493b84f2fc34ab1bb798b20c022be6edf036b3d7 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/newview/tests/llviewerassetstats_test.cpp')
-rw-r--r-- | indra/newview/tests/llviewerassetstats_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/tests/llviewerassetstats_test.cpp b/indra/newview/tests/llviewerassetstats_test.cpp index 41d141255b..ae93778534 100644 --- a/indra/newview/tests/llviewerassetstats_test.cpp +++ b/indra/newview/tests/llviewerassetstats_test.cpp @@ -39,7 +39,7 @@ namespace LLStatViewer { - LLTrace::<> FPS_SAMPLE("fpssample"); + LLTrace::MeasurementStatHandle<> FPS_SAMPLE("fpssample"); } void LLVOAvatar::getNearbyRezzedStats(std::vector<S32>& counts) |