diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-20 06:34:17 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-20 06:34:17 -0400 |
| commit | 50ea915256d8c23c708a27154bb70e052c86ff51 (patch) | |
| tree | 8e7ab6d46c775e756ac27ebb0511eb3c33fa4e32 /indra/llcommon/llsdserialize.cpp | |
| parent | fd2b0084bf92e34d35a9a7e3a90f15526f390927 (diff) | |
| parent | e15c97404f1e69745e055beea53aef67f5aa8ccc (diff) | |
merge changes for storm-1565
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); |