diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-08-10 10:53:59 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-08-10 10:53:59 -0700 |
| commit | e1532afb1267b2012a6fbb9b72b09ab80a85f763 (patch) | |
| tree | e35dbac762939feef4d175f3b133ae9d9f27e0ff /indra/llcommon/llsdserialize.cpp | |
| parent | 802a063a878a145904d152bed98ac55e7cfecb42 (diff) | |
| parent | 11005a9d917dde208fc0917bb84701d09e1a395e (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llcommon/llsdserialize.cpp')
| -rw-r--r-- | indra/llcommon/llsdserialize.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index bf62600514..6610daa1e0 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -313,8 +313,10 @@ LLSDParser::LLSDParser() LLSDParser::~LLSDParser() { } +LLFastTimer::DeclareTimer FTM_SD_PARSE("LLSD Parsing"); S32 LLSDParser::parse(std::istream& istr, LLSD& data, S32 max_bytes) { + LLFastTimer _(FTM_SD_PARSE); mCheckLimits = (LLSDSerialize::SIZE_UNLIMITED == max_bytes) ? false : true; mMaxBytesLeft = max_bytes; return doParse(istr, data); |