summaryrefslogtreecommitdiff
path: root/indra/llui/llsdparam.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-11-22 09:49:05 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-11-22 09:49:05 -0500
commit4b0d2f8209f496f90e2c13643b0307a86797bdb2 (patch)
tree5d520cbd416b5f8a7624239a2a1b1b6e8c55f3bb /indra/llui/llsdparam.cpp
parent147b14089916bd2cbb078b0bc47c76458ab31e79 (diff)
parent1dd24cfcf85f4807410bb8d5320a692e2d7e121c (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
//