diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-07-24 14:40:23 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-07-24 14:40:23 -0400 |
| commit | 9f393c1d99232e622317f7f0dd28519c2af63d0d (patch) | |
| tree | 842f1ab4c5d13bc1cd772ebf1356c8f7424596d9 /indra/newview/llagentpilot.cpp | |
| parent | 2b2719d8cae1e35fa9e4cfcb87519bae9a64b2bf (diff) | |
| parent | a4966a661213a25b780604084fe169565f62f548 (diff) | |
merge up to latest snowstorm integration branch
Diffstat (limited to 'indra/newview/llagentpilot.cpp')
| -rwxr-xr-x[-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..100755 --- 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(); |