diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-22 13:16:02 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-22 13:16:02 -0400 |
| commit | ff60546070d15790775f16ab6239273d7bf00ae8 (patch) | |
| tree | f4988918fe86a11fdc692265d444ff7b3a8159cf /indra/llcommon/llsdserialize.cpp | |
| parent | e64b9269cb385a22c83d1c912e336aed11e40efe (diff) | |
| parent | aa1424365e3df49edfc189ef433e050f502534e9 (diff) | |
merge
Diffstat (limited to 'indra/llcommon/llsdserialize.cpp')
| -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); |