diff options
| author | Richard Linden <none@none> | 2011-11-10 10:58:11 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-10 10:58:11 -0800 |
| commit | b2fffa74f7fbafba927b731f38681379dfa7c980 (patch) | |
| tree | 00a3dc5d6db3b3cb479a2e3634f599fbcceb14b8 /indra/llui/llsdparam.cpp | |
| parent | 5fa125ea0b733b3729208d90777d260db5e331e8 (diff) | |
| parent | 55d282941454199608b15123f0420a1e8c8d0807 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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 // |