diff options
| author | prep <prep@lindenlab.com> | 2013-03-11 14:45:53 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2013-03-11 14:45:53 -0400 |
| commit | 207d9fd767895a3470722fb298eeef4f338e479a (patch) | |
| tree | 050b5c2c1d88b910aeebe8c8be04c19f548bb123 /indra/llxml/llcontrol.cpp | |
| parent | 82c92ce5a97d6a83505c775348aef692e18e42ed (diff) | |
| parent | fe042430b03667abcd6b72ef9cc27d82d85f4242 (diff) | |
Viewer-chui merge
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); } |