diff options
| author | Richard Linden <none@none> | 2011-08-11 10:11:59 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-08-11 10:11:59 -0700 |
| commit | b215c724c1394e7c27a0309341ffc3b4f2154b25 (patch) | |
| tree | c9a5eba93a0d333285bc2e87e15ed40e546f7d28 /indra/llcommon/llsdserialize.cpp | |
| parent | c7b6a25728cd360348d1c3da5ace0971767206a4 (diff) | |
| parent | 9a9e78740ada6a64847d1e915ae8e92258e8f10a (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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); |