diff options
author | Richard Linden <none@none> | 2011-11-09 13:01:46 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2011-11-09 13:01:46 -0800 |
commit | 35a471886914beec096f000bcd4595c651ed3444 (patch) | |
tree | f865e3190f09937bb05126a4f5fa29d2b69a81c4 /indra/llui/llsdparam.cpp | |
parent | 3ecba909a30bf3a0cb9ac51878638ae6520f0177 (diff) | |
parent | 136751b8fb9756006fec9721808759ebf61bcf14 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llui/llsdparam.cpp')
-rw-r--r-- | indra/llui/llsdparam.cpp | 2 |
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 // |