diff options
| author | simon <none@none> | 2013-04-11 16:23:36 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-04-11 16:23:36 -0700 |
| commit | 066f2acadf6f1624fcdfc22263a890c370473887 (patch) | |
| tree | a4e52b29d8074cdc8782ff28b9b0500b32dada50 /indra/llmessage/llavatarnamecache.cpp | |
| parent | 98a82c50d539451e1931826ca75fbc01d611806d (diff) | |
| parent | 460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff) | |
Forgot to commit @#! 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 8f91d2a23f..9a68093427 100644 --- a/indra/llmessage/llavatarnamecache.cpp +++ b/indra/llmessage/llavatarnamecache.cpp @@ -435,8 +435,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 |