diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-08-18 14:05:27 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-08-18 14:05:27 -0700 |
| commit | 64e3907853f4a2fba6f569b69d08a3f632d046e7 (patch) | |
| tree | 416acf0248af91944f074808c30650e861c20258 /indra/llcommon | |
| parent | b2ef0f99882db73680cc5dfb9570255414f7ba6d (diff) | |
| parent | ff46a6f42301218dcc14945feed65109a9bb71b4 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llcommon')
| -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); |