diff options
author | Richard Linden <none@none> | 2013-09-05 14:21:57 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-09-05 14:21:57 -0700 |
commit | 9dc6478544711b1f03c9f7010421f9c8ebbbe008 (patch) | |
tree | 1d28248570ac6e48596c787734bc39a891d9752e /indra/llcommon/llsdparam.cpp | |
parent | 736efc7b574635d5c86a97a33b456dd79a035777 (diff) | |
parent | cbe397ad13665c7bc993e10d8fe1e4a876253378 (diff) |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llcommon/llsdparam.cpp')
-rwxr-xr-x | indra/llcommon/llsdparam.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsdparam.cpp b/indra/llcommon/llsdparam.cpp index c1ba777543..371bd49c04 100755 --- a/indra/llcommon/llsdparam.cpp +++ b/indra/llcommon/llsdparam.cpp @@ -37,7 +37,7 @@ 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"); +LLTrace::TimeBlock FTM_SD_PARAM_ADAPTOR("LLSD to LLInitParam conversion"); // // LLParamSDParser |