diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-05-30 23:51:33 +0000 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-05-30 23:51:33 +0000 |
| commit | af8c2bc94868e056908b4ae2fc285925cd68b56b (patch) | |
| tree | 2fc5e74073317ecc3e7b8e64b7c3784e88ba5099 /indra/llmessage/llavatarnamecache.cpp | |
| parent | 2df0a2494691ebfdd305e6a5ee280dd758a1b337 (diff) | |
| parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) | |
Merge. Pull viewer-release to get the new version scheme changes.
Diffstat (limited to 'indra/llmessage/llavatarnamecache.cpp')
| -rwxr-xr-x[-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..100755 --- 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 |