diff options
| author | David Walter Seikel | 2012-02-21 03:54:42 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2012-02-21 03:54:42 +1000 |
| commit | 1d7d760b3dc3c351082985fffe0a018108f6a3e9 (patch) | |
| tree | ee6fd606e264ea1f50d822893632299ffd7db191 | |
| parent | Merge branch 'next' of git://github.com/imprudence/imprudence into next (diff) | |
| download | meta-impy-1d7d760b3dc3c351082985fffe0a018108f6a3e9.zip meta-impy-1d7d760b3dc3c351082985fffe0a018108f6a3e9.tar.gz meta-impy-1d7d760b3dc3c351082985fffe0a018108f6a3e9.tar.bz2 meta-impy-1d7d760b3dc3c351082985fffe0a018108f6a3e9.tar.xz | |
Comment out part of b7dcec410daa68b70597758930f015a7f631f388 "Fixed tons of 'LLXMLTree invalid token' warnings spamming the log and made the warnings we show less confusing", it made other sims vanish.
| -rw-r--r-- | linden/indra/llcommon/llsdserialize_xml.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/linden/indra/llcommon/llsdserialize_xml.cpp b/linden/indra/llcommon/llsdserialize_xml.cpp index 3545309..7729a5f 100644 --- a/linden/indra/llcommon/llsdserialize_xml.cpp +++ b/linden/indra/llcommon/llsdserialize_xml.cpp | |||
| @@ -394,13 +394,13 @@ S32 LLSDXMLParser::Impl::parse(std::istream& input, LLSD& data) | |||
| 394 | if (status == XML_STATUS_ERROR) | 394 | if (status == XML_STATUS_ERROR) |
| 395 | { | 395 | { |
| 396 | std::string error_string(XML_ErrorString(XML_GetErrorCode( mParser ))); | 396 | std::string error_string(XML_ErrorString(XML_GetErrorCode( mParser ))); |
| 397 | if (input.gcount() == 0) | 397 | // if (input.gcount() == 0) |
| 398 | { | 398 | // { |
| 399 | // nothing to do -- MC | 399 | // // nothing to do -- MC |
| 400 | data = LLSD(); | 400 | // data = LLSD(); |
| 401 | return LLSDParser::PARSE_FAILURE; | 401 | // return LLSDParser::PARSE_FAILURE; |
| 402 | } | 402 | // } |
| 403 | else if (error_string != "parsing aborted") // end of input | 403 | /*else*/ if (error_string != "parsing aborted") // end of input |
| 404 | { | 404 | { |
| 405 | S32 line_number = XML_GetCurrentLineNumber( mParser ); | 405 | S32 line_number = XML_GetCurrentLineNumber( mParser ); |
| 406 | // This parses LLCurl::Responder::completedRaw always, even | 406 | // This parses LLCurl::Responder::completedRaw always, even |