Skip to content
Snippets Groups Projects
Commit ff46a6f4 authored by Richard Nelson's avatar Richard Nelson
Browse files

EXP-1107 FIX Crash in LLFastTimer::NamedTimer::accumulateTimings

parent 72ffcd14
No related branches found
No related tags found
No related merge requests found
...@@ -313,10 +313,8 @@ LLSDParser::LLSDParser() ...@@ -313,10 +313,8 @@ LLSDParser::LLSDParser()
LLSDParser::~LLSDParser() LLSDParser::~LLSDParser()
{ } { }
LLFastTimer::DeclareTimer FTM_SD_PARSE("LLSD Parsing");
S32 LLSDParser::parse(std::istream& istr, LLSD& data, S32 max_bytes) S32 LLSDParser::parse(std::istream& istr, LLSD& data, S32 max_bytes)
{ {
LLFastTimer _(FTM_SD_PARSE);
mCheckLimits = (LLSDSerialize::SIZE_UNLIMITED == max_bytes) ? false : true; mCheckLimits = (LLSDSerialize::SIZE_UNLIMITED == max_bytes) ? false : true;
mMaxBytesLeft = max_bytes; mMaxBytesLeft = max_bytes;
return doParse(istr, data); return doParse(istr, data);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment