diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-15 16:22:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-15 16:22:03 -0400 |
| commit | b8320207bb911a311a498426fdd4a987dd7748ea (patch) | |
| tree | 37c5c4795916fd9787014e9e39727e39727f3482 /indra/llcommon/llsdserialize.cpp | |
| parent | 45036820f85844093f3a2031cff10c6633926da4 (diff) | |
| parent | 25f1653ca0a25c73b3c0649ee5bb7c65e5378eac (diff) | |
merge changes for storm-1557
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); |