summaryrefslogtreecommitdiff
path: root/indra/llui/llsdparam.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-11-28 10:13:34 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-11-28 10:13:34 -0500
commit5374e544ed5888548bea334bd8ca7ca53372d031 (patch)
treeb73c80d7cdc6a78ad6caed46b9485f18b3f039a7 /indra/llui/llsdparam.cpp
parent8c86a08e72708e96dcf67830518187a00478bbfd (diff)
parentfb605a047aa1c6b293b9546a06ac800c53d109ba (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
//