diff options
| author | Runitai Linden <davep@lindenlab.com> | 2022-01-21 10:33:37 -0600 |
|---|---|---|
| committer | Runitai Linden <davep@lindenlab.com> | 2022-01-21 10:33:37 -0600 |
| commit | 5b04123aec281de30fb8b6473600f6b1e9d16909 (patch) | |
| tree | 1ffac17fe885182483ed44fa93db723554761024 /indra/llcommon/llsdparam.h | |
| parent | e7caafba5c4eec21f02a642e37865bc04cd6536e (diff) | |
| parent | 016b002b0f2faae0d62ce2d07b8e9856a3a1814d (diff) | |
Merge remote-tracking branch 'remotes/origin/DRTVWR-546' into DRTVWR-539
# Conflicts:
# indra/llcommon/lltracerecording.h
# indra/newview/llfloaterpreference.cpp
Diffstat (limited to 'indra/llcommon/llsdparam.h')
| -rw-r--r-- | indra/llcommon/llsdparam.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llcommon/llsdparam.h b/indra/llcommon/llsdparam.h index 93910b70ae..82a623a8a0 100644 --- a/indra/llcommon/llsdparam.h +++ b/indra/llcommon/llsdparam.h @@ -110,7 +110,6 @@ private: }; -extern LL_COMMON_API LLTrace::BlockTimerStatHandle FTM_SD_PARAM_ADAPTOR; template<typename T> class LLSDParamAdapter : public T { @@ -118,7 +117,7 @@ public: LLSDParamAdapter() {} LLSDParamAdapter(const LLSD& sd) { - LL_RECORD_BLOCK_TIME(FTM_SD_PARAM_ADAPTOR); + LL_PROFILE_ZONE_SCOPED; 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; |