diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-06 09:53:57 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-06 09:53:57 -0500 |
| commit | b3e34545a4d37444a2def3462d75e185df5535d0 (patch) | |
| tree | f4a09ef60040db8399528a7f3564b5d265b3e22a /indra/llmessage/llavatarnamecache.cpp | |
| parent | 7b0b5726dd2fcf5b79ed1b112891655fad0f96eb (diff) | |
| parent | 54cdc322b8f2bd35b289cacf3493622e7cc51194 (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 |