diff options
| author | McCabe Maxsted | 2009-02-18 01:24:53 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-02-18 01:24:53 -0700 |
| commit | c0dfc20ca0701e0bf0dce41a03a705df1747b460 (patch) | |
| tree | 51f4d3bdbb7c2c1eadc1b07c94782d95474745e3 /linden/indra/llcommon/llsdserialize.cpp | |
| parent | Merge commit 'mccabe/next' into next (diff) | |
| parent | Fixed crash in Top Scripts (diff) | |
| download | meta-impy-c0dfc20ca0701e0bf0dce41a03a705df1747b460.zip meta-impy-c0dfc20ca0701e0bf0dce41a03a705df1747b460.tar.gz meta-impy-c0dfc20ca0701e0bf0dce41a03a705df1747b460.tar.bz2 meta-impy-c0dfc20ca0701e0bf0dce41a03a705df1747b460.tar.xz | |
Fixed crash in Top Scripts
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 | ||