diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-08-19 11:14:20 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-08-19 11:14:20 -0700 |
| commit | cf4355851606c996ed8269ac709c8eaa5c9ccdef (patch) | |
| tree | aa465be3aeef1d70da09bc9bb37cc7f3ca4f185a /indra/llcommon | |
| parent | 504fabba1d8d2ffd1d3c43368cbd1a8522ca2ebc (diff) | |
| parent | e84f9acf761bd60a558682e87e053207bc9bc014 (diff) | |
Merge
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llsdserialize.cpp | 2 | ||||
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 2 |
2 files changed, 1 insertions, 3 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); diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 27b1bce60c..fa2b3bff36 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -29,7 +29,7 @@ const S32 LL_VERSION_MAJOR = 3; const S32 LL_VERSION_MINOR = 0; -const S32 LL_VERSION_PATCH = 1; +const S32 LL_VERSION_PATCH = 2; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; |