diff options
| author | Richard Linden <none@none> | 2013-10-24 14:39:19 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-10-24 14:39:19 -0700 |
| commit | d13f26a6fcde03f5464e986b204b2fbb5848d861 (patch) | |
| tree | abebd18faa3bd63c75cf35bf0e6742e1f13d36f2 /indra/llcommon/llmetricperformancetester.cpp | |
| parent | dc60a7564abf16cbf269e47cfc33ed00c6bb0870 (diff) | |
| parent | ab43be5ddb50198304de1ae0e82b641c7d343449 (diff) | |
Merge
Diffstat (limited to 'indra/llcommon/llmetricperformancetester.cpp')
| -rwxr-xr-x | indra/llcommon/llmetricperformancetester.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llmetricperformancetester.cpp b/indra/llcommon/llmetricperformancetester.cpp index 7963485456..1fc821d9a9 100755 --- a/indra/llcommon/llmetricperformancetester.cpp +++ b/indra/llcommon/llmetricperformancetester.cpp @@ -91,7 +91,7 @@ LLMetricPerformanceTesterBasic* LLMetricPerformanceTesterBasic::getTester(std::s // Return TRUE if this metric is requested or if the general default "catch all" metric is requested BOOL LLMetricPerformanceTesterBasic::isMetricLogRequested(std::string name) { - return (LLTrace::BlockTimerStatHandle::sMetricLog && ((LLTrace::BlockTimerStatHandle::sLogName == name) || (LLTrace::BlockTimerStatHandle::sLogName == DEFAULT_METRIC_NAME))); + return (LLTrace::BlockTimer::sMetricLog && ((LLTrace::BlockTimer::sLogName == name) || (LLTrace::BlockTimer::sLogName == DEFAULT_METRIC_NAME))); } /*static*/ @@ -194,7 +194,7 @@ void LLMetricPerformanceTesterBasic::preOutputTestResults(LLSD* sd) void LLMetricPerformanceTesterBasic::postOutputTestResults(LLSD* sd) { - LLTrace::BlockTimerStatHandle::pushLog(*sd); + LLTrace::BlockTimer::pushLog(*sd); } void LLMetricPerformanceTesterBasic::outputTestResults() |