diff options
| author | Richard Linden <none@none> | 2013-04-12 15:56:49 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-04-12 15:56:49 -0700 |
| commit | 06a953f7fece6e7c5cb8f9facd246580767f8591 (patch) | |
| tree | 18e0db8a706d6451ebad1ab640871a3ca0f52d1c /indra/newview/tests | |
| parent | 39d8ea6327ad96b4977dfec991a20d66e2442b50 (diff) | |
| parent | dea70426a5c96957dd73b7a50c7fdedf77a3bdfb (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) |