diff options
| author | Richard Linden <none@none> | 2013-09-05 14:04:13 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-05 14:04:13 -0700 |
| commit | cbe397ad13665c7bc993e10d8fe1e4a876253378 (patch) | |
| tree | 52cd665a1138a65bd8ebfc94478c665ea40b2e25 /indra/llcommon/llsdparam.h | |
| parent | 12688c8b549d2baa33509dca60bbe14b039b17db (diff) | |
changed fast timer over to using macro
another attempt to move mem stat into base class
Diffstat (limited to 'indra/llcommon/llsdparam.h')
| -rwxr-xr-x | indra/llcommon/llsdparam.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llsdparam.h b/indra/llcommon/llsdparam.h index 7cfc265c62..47ec6414dd 100755 --- a/indra/llcommon/llsdparam.h +++ b/indra/llcommon/llsdparam.h @@ -110,7 +110,7 @@ private: }; -extern LL_COMMON_API LLFastTimer::DeclareTimer FTM_SD_PARAM_ADAPTOR; +extern LL_COMMON_API LLTrace::TimeBlock FTM_SD_PARAM_ADAPTOR; template<typename T> class LLSDParamAdapter : public T { @@ -118,7 +118,7 @@ public: LLSDParamAdapter() {} LLSDParamAdapter(const LLSD& sd) { - LLFastTimer _(FTM_SD_PARAM_ADAPTOR); + LL_RECORD_BLOCK_TIME(FTM_SD_PARAM_ADAPTOR); LLParamSDParser parser; // don't spam for implicit parsing of LLSD, as we want to allow arbitrary freeform data and ignore most of it bool parse_silently = true; |