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/llmessage/llavatarnamecache.cpp | |
| parent | 2784a515b0e725f74bf0e5fab47153ba358b26d6 (diff) | |
| parent | fe042430b03667abcd6b72ef9cc27d82d85f4242 (diff) | |
merge
Diffstat (limited to 'indra/llmessage/llavatarnamecache.cpp')
| -rw-r--r-- | indra/llmessage/llavatarnamecache.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp index a6e2c89ba4..f9e3ad26f7 100644 --- a/indra/llmessage/llavatarnamecache.cpp +++ b/indra/llmessage/llavatarnamecache.cpp @@ -443,8 +443,10 @@ void LLAvatarNameCache::cleanupClass() void LLAvatarNameCache::importFile(std::istream& istr) { LLSD data; - S32 parse_count = LLSDSerialize::fromXMLDocument(data, istr); - if (parse_count < 1) return; + if (LLSDParser::PARSE_FAILURE == LLSDSerialize::fromXMLDocument(data, istr)) + { + return; + } // by convention LLSD storage is a map // we only store one entry in the map |