diff options
| author | Richard Linden <none@none> | 2013-04-12 15:26:37 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-04-12 15:26:37 -0700 |
| commit | dea70426a5c96957dd73b7a50c7fdedf77a3bdfb (patch) | |
| tree | c493f5e7f2a4717e053e84a6cba3414d7bdd73bb /indra/newview/tests | |
| parent | a904e7b21b64a87073a446445de46318832d1eb1 (diff) | |
| parent | 1ddad3737977b9e750c4d1815ea99b51e75f18aa (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) |