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/llcommon/llmetricperformancetester.cpp | |
parent | 2784a515b0e725f74bf0e5fab47153ba358b26d6 (diff) | |
parent | fe042430b03667abcd6b72ef9cc27d82d85f4242 (diff) |
merge
Diffstat (limited to 'indra/llcommon/llmetricperformancetester.cpp')
-rw-r--r-- | indra/llcommon/llmetricperformancetester.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llmetricperformancetester.cpp b/indra/llcommon/llmetricperformancetester.cpp index 41d3eb0bf3..731e58bd20 100644 --- a/indra/llcommon/llmetricperformancetester.cpp +++ b/indra/llcommon/llmetricperformancetester.cpp @@ -100,7 +100,7 @@ LLSD LLMetricPerformanceTesterBasic::analyzeMetricPerformanceLog(std::istream& i LLSD ret; LLSD cur; - while (!is.eof() && LLSDSerialize::fromXML(cur, is)) + while (!is.eof() && LLSDParser::PARSE_FAILURE != LLSDSerialize::fromXML(cur, is)) { for (LLSD::map_iterator iter = cur.beginMap(); iter != cur.endMap(); ++iter) { |