summaryrefslogtreecommitdiff
path: root/indra/llui/llsdparam.cpp
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-11-14 11:29:02 -0800
committerLeslie Linden <leslie@lindenlab.com>2011-11-14 11:29:02 -0800
commit2f55effd25c035c2af80bd5e6754c96a18f9d7e0 (patch)
tree02d2c153b4e40b9770521ee64fb45fd7176b082c /indra/llui/llsdparam.cpp
parent7a31a48536f8a373b4e857ca8b906a6984530a04 (diff)
parentd8e1b48328017eba1c68bcc56a4f67085643988a (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
//