diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-07-17 22:30:12 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-07-17 22:30:12 +0000 |
| commit | 292627c09df6085c985a189edd5df06d3ca1eb47 (patch) | |
| tree | 777f4e9520cf4f25666e28f882e540ea23b1cdc0 | |
| parent | b27e0e08f07f84e9143f51a22752ee384eedfa72 (diff) | |
svn merge -r 91176:92383 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-23-Server
Backport fixes from the 1.23 Server branch
* DEV-17223 remove the words slot and bets from dataserver.xml
* DEV-17351 Unable to set estate manager
* DEV-17138 users with god mode capabilities not able to join groups
* DEV-17785 SVC-2633: Floating Text which was set before Server Update 1.23 does not do linebreaks anymore but one line instead
* DEV-17863 Memory Leak in 1.23 (related to returning objects?)
* DEV-17804 CSR tool showing old data on Summary page
* DEV-17811 Ban list showing (???) (???) for names
dataserver-is-deprecated
| -rw-r--r-- | indra/llcommon/llsdserialize.cpp | 2 | ||||
| -rw-r--r-- | indra/llcommon/llsdserialize_xml.cpp | 9 | ||||
| -rw-r--r-- | indra/llcommon/llversionserver.h | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index d496230dd8..e4ad00da6d 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -324,7 +324,7 @@ S32 LLSDParser::parse(std::istream& istr, LLSD& data, S32 max_bytes) S32 LLSDParser::parseLines(std::istream& istr, LLSD& data) { mCheckLimits = false; - mParseLines = true; + mParseLines = false; // was true, Emergency fix DEV-17785 parsing newline failure return doParse(istr, data); } diff --git a/indra/llcommon/llsdserialize_xml.cpp b/indra/llcommon/llsdserialize_xml.cpp index e23f765957..51a2e5ec40 100644 --- a/indra/llcommon/llsdserialize_xml.cpp +++ b/indra/llcommon/llsdserialize_xml.cpp @@ -808,11 +808,12 @@ void LLSDXMLParser::parsePart(const char *buf, int len) // virtual S32 LLSDXMLParser::doParse(std::istream& input, LLSD& data) const { - if (mParseLines) - { +// Remove code - emergency fix DEV-17785 parsing newline failure +// if (mParseLines) +// { // Use line-based reading (faster code) - return impl.parseLines(input, data); - } +// return impl.parseLines(input, data); +// } return impl.parse(input, data); } diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index af76f528e8..5fbf6582da 100644 --- a/indra/llcommon/llversionserver.h +++ b/indra/llcommon/llversionserver.h @@ -34,8 +34,8 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 23; -const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 87048; +const S32 LL_VERSION_PATCH = 2; +const S32 LL_VERSION_BUILD = 92378; const char * const LL_CHANNEL = "Second Life Server"; |