diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-08-18 17:52:00 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-08-18 17:52:00 -0400 |
| commit | ce0b04889d3d02d1d1eabe84a566a641db1e2d8e (patch) | |
| tree | f9501fe5624d4a0a40ce6e87fe2fb87ae2d4f476 /indra/llcommon/llsdserialize.cpp | |
| parent | 4fb809eed5fbed458b5be883fba7196a5712aa48 (diff) | |
| parent | b2ef0f99882db73680cc5dfb9570255414f7ba6d (diff) | |
Merge.
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); |