diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-15 16:35:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-15 16:35:41 -0400 |
| commit | cb957d3dabfd0a419cb70461cc5bf3af2adba7a3 (patch) | |
| tree | ac9978539aa02d80bf8c026aa3b2e1ba85404ecf /indra/llcommon/llsdserialize.cpp | |
| parent | 7819b49086729187e198bf69f9c45f1c63f11ff2 (diff) | |
| parent | b8320207bb911a311a498426fdd4a987dd7748ea (diff) | |
merge late 3.0.1 beta candidate fixes
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); |