summaryrefslogtreecommitdiff
path: root/indra/llcommon/llsdparam.h
diff options
context:
space:
mode:
authorNicky <nicky.dasmijn@gmail.com>2022-06-13 20:09:42 +0200
committerNicky <nicky.dasmijn@gmail.com>2022-06-13 20:09:42 +0200
commit1b73835d6e80bc64c520a8846aebdbe1b7c9705b (patch)
treeb972275919bf6c620bbbcb81dd6b12568494561e /indra/llcommon/llsdparam.h
parent78e069f5e8ef1ee312e709934482b23aa86a69c2 (diff)
parentc08a61453b21664da3687661512e2ea208f90d98 (diff)
Merge branch 'DRTVWR-543-maint_cmake' of bitbucket.org:NickyD/viewer-cmake into DRTVWR-543-maint_cmake
Diffstat (limited to 'indra/llcommon/llsdparam.h')
-rw-r--r--indra/llcommon/llsdparam.h3
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;