summaryrefslogtreecommitdiff
path: root/indra/llui/llsdparam.cpp
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-11-15 18:30:23 -0500
committerDebi King (Dessie) <dessie@lindenlab.com>2011-11-15 18:30:23 -0500
commitc69ebf3670be0f94235aa85c77451b14b726916e (patch)
tree2a5ce3a8f71e9bfdf4ac63cf3188307609269366 /indra/llui/llsdparam.cpp
parent6bce3d1b9d05dce77db50f3d2c92a70ad6ac8166 (diff)
parent7766ccb7731a596d6716e9d0def90b3d7da5fcf3 (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
//