diff options
| author | McCabe Maxsted | 2009-02-17 22:02:45 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-02-17 22:02:45 -0700 |
| commit | 30b9fd9f0fe44b820d51a47c9aab135127b82b59 (patch) | |
| tree | 8101044c037263c3bf1273d57909cda05db380f1 /linden/indra/llcommon/llsdserialize.cpp | |
| parent | Backported Top Scripts changes from 1.22 (diff) | |
| download | meta-impy-30b9fd9f0fe44b820d51a47c9aab135127b82b59.zip meta-impy-30b9fd9f0fe44b820d51a47c9aab135127b82b59.tar.gz meta-impy-30b9fd9f0fe44b820d51a47c9aab135127b82b59.tar.bz2 meta-impy-30b9fd9f0fe44b820d51a47c9aab135127b82b59.tar.xz | |
Backported LLSD changes from 1.22
Diffstat (limited to 'linden/indra/llcommon/llsdserialize.cpp')
| -rw-r--r-- | linden/indra/llcommon/llsdserialize.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llcommon/llsdserialize.cpp b/linden/indra/llcommon/llsdserialize.cpp index d42842d..f21ff68 100644 --- a/linden/indra/llcommon/llsdserialize.cpp +++ b/linden/indra/llcommon/llsdserialize.cpp | |||
| @@ -324,7 +324,7 @@ S32 LLSDParser::parse(std::istream& istr, LLSD& data, S32 max_bytes) | |||
| 324 | S32 LLSDParser::parseLines(std::istream& istr, LLSD& data) | 324 | S32 LLSDParser::parseLines(std::istream& istr, LLSD& data) |
| 325 | { | 325 | { |
| 326 | mCheckLimits = false; | 326 | mCheckLimits = false; |
| 327 | mParseLines = false; // was true, Emergency fix DEV-17785 parsing newline failure | 327 | mParseLines = true; |
| 328 | return doParse(istr, data); | 328 | return doParse(istr, data); |
| 329 | } | 329 | } |
| 330 | 330 | ||