summaryrefslogtreecommitdiff
path: root/indra/llui/llsdparam.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-11-18 12:54:15 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-11-18 12:54:15 -0500
commit7ee4c04365407920fb938311e3c237f7af687cc4 (patch)
tree8c11ca25e7381555c16be9b227a8c960fb8c4430 /indra/llui/llsdparam.cpp
parente0759c82be89963c105fbc906ce219d1e922a636 (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
//