diff options
| author | Don Kjer <don@lindenlab.com> | 2013-03-05 22:05:22 -0800 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2013-03-05 22:05:22 -0800 |
| commit | 54cdc322b8f2bd35b289cacf3493622e7cc51194 (patch) | |
| tree | 4f686cdfbaaf8819dfb1b015a1c8388ea1f59eac /indra/llxml/llcontrol.cpp | |
| parent | 9a0c52a247ecbd79f5f872ceb97a6be3e0499bea (diff) | |
Fixing issues with not detecting when LLSD XML parsing fails. Changing most http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam.
Diffstat (limited to 'indra/llxml/llcontrol.cpp')
| -rw-r--r-- | indra/llxml/llcontrol.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp index 53d9380f4f..666c03e9ff 100644 --- a/indra/llxml/llcontrol.cpp +++ b/indra/llxml/llcontrol.cpp @@ -850,12 +850,10 @@ U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_v return 0; } - S32 ret = LLSDSerialize::fromXML(settings, infile); - - if (ret <= 0) + if (LLSDParser::PARSE_FAILURE == LLSDSerialize::fromXML(settings, infile)) { infile.close(); - llwarns << "Unable to open LLSD control file " << filename << ". Trying Legacy Method." << llendl; + llwarns << "Unable to parse LLSD control file " << filename << ". Trying Legacy Method." << llendl; return loadFromFileLegacy(filename, TRUE, TYPE_STRING); } |