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/llcommon/llmetricperformancetester.cpp | |
parent | 82c92ce5a97d6a83505c775348aef692e18e42ed (diff) | |
parent | fe042430b03667abcd6b72ef9cc27d82d85f4242 (diff) |
Viewer-chui 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) { |