diff options
| author | Richard Linden <none@none> | 2013-04-11 19:17:55 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-04-11 19:17:55 -0700 |
| commit | 2436bd9487ac62899ed01859bdd4c0871020d4f7 (patch) | |
| tree | 283368b1ff05b4cbdcd52b9e3c103081178006ac /indra/newview/tests | |
| parent | bdc6d58b7e84bc81977148995b0028f7420eee65 (diff) | |
| parent | 288b43facb89184cc8fced7e7542baa2c8549831 (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) |