diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-08-18 13:59:38 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-08-18 13:59:38 -0700 |
| commit | ff46a6f42301218dcc14945feed65109a9bb71b4 (patch) | |
| tree | a8fea57ac652d417c2b18fab59cd8ea05f9e074c /indra | |
| parent | 72ffcd147a85cb727d194a4c57360a1a69890cb1 (diff) | |
EXP-1107 FIX Crash in LLFastTimer::NamedTimer::accumulateTimings
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llsdserialize.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index 6610daa1e0..bf62600514 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -313,10 +313,8 @@ 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); |