summaryrefslogtreecommitdiff
path: root/indra/llui/llsdparam.cpp
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2011-11-18 10:45:40 -0500
committerLogan Dethrow <log@lindenlab.com>2011-11-18 10:45:40 -0500
commit3819c3b049abb0771c7129c0a11a8fcd0725f9fd (patch)
treef0bb1432b1ae475c7d844f278b668e1d76193e96 /indra/llui/llsdparam.cpp
parent620b63a31667d93d9186217eb355d05e71ff245c (diff)
parent4bcdcd02fb7e83a2754084f2fb599b56ea6c8743 (diff)
Merge
Diffstat (limited to 'indra/llui/llsdparam.cpp')
-rw-r--r--indra/llui/llsdparam.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llsdparam.cpp b/indra/llui/llsdparam.cpp
index 6fa90933a4..0e29873bb0 100644
--- a/indra/llui/llsdparam.cpp
+++ b/indra/llui/llsdparam.cpp
@@ -36,6 +36,8 @@ static LLInitParam::Parser::parser_write_func_map_t sWriteFuncs;
static LLInitParam::Parser::parser_inspect_func_map_t sInspectFuncs;
static const LLSD NO_VALUE_MARKER;
+LLFastTimer::DeclareTimer FTM_SD_PARAM_ADAPTOR("LLSD to LLInitParam conversion");
+
//
// LLParamSDParser
//