diff options
| author | Richard Linden <none@none> | 2013-04-12 14:27:25 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-04-12 14:27:25 -0700 |
| commit | 1ddad3737977b9e750c4d1815ea99b51e75f18aa (patch) | |
| tree | 140d51925a3cd2fbca3677ff293fc2d37b051759 /indra/newview/tests | |
| parent | 54d7fc95893d1bf8cc3b6ebe94f3bf37f40125d0 (diff) | |
| parent | 8db22a591645a3a7c3308827ca819bc2415692d8 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/newview/tests')
| -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) |