diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-03-06 17:21:21 -0500 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-03-06 17:21:21 -0500 |
| commit | 25255ee13efdc3e8090412f7fce6bb7723277053 (patch) | |
| tree | f77c6eb77e3cbcfcf72d1b5998a1275fac002d4c /indra/newview/llagentpilot.cpp | |
| parent | 2784a515b0e725f74bf0e5fab47153ba358b26d6 (diff) | |
| parent | fe042430b03667abcd6b72ef9cc27d82d85f4242 (diff) | |
merge
Diffstat (limited to 'indra/newview/llagentpilot.cpp')
| -rw-r--r-- | indra/newview/llagentpilot.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagentpilot.cpp b/indra/newview/llagentpilot.cpp index 734c502fcf..c7872fc5f6 100644 --- a/indra/newview/llagentpilot.cpp +++ b/indra/newview/llagentpilot.cpp @@ -139,7 +139,7 @@ void LLAgentPilot::loadXML(const std::string& filename) mActions.reset(); LLSD record; - while (!file.eof() && LLSDSerialize::fromXML(record, file)) + while (!file.eof() && LLSDParser::PARSE_FAILURE != LLSDSerialize::fromXML(record, file)) { Action action; action.mTime = record["time"].asReal(); |