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 /indra/llcommon/llsdserialize_xml.cpp | |
| 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
Diffstat (limited to 'indra/llcommon/llsdserialize_xml.cpp')
| -rw-r--r-- | indra/llcommon/llsdserialize_xml.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
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); } |