diff options
| author | simon <none@none> | 2013-04-11 16:04:21 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-04-11 16:04:21 -0700 |
| commit | c7bab8ab8b25249d1f8f87746b50fce4820f542a (patch) | |
| tree | f10f811e0a03002b4c545eb5c51f99d7c5b83a5b /indra/llmessage/llcachename.cpp | |
| parent | a976f5c217ce97c70a7e151b9a490e6a6ebf1396 (diff) | |
| parent | 460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff) | |
Merge
Diffstat (limited to 'indra/llmessage/llcachename.cpp')
| -rw-r--r-- | indra/llmessage/llcachename.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp index 3fb36eecf0..267c48e1d2 100644 --- a/indra/llmessage/llcachename.cpp +++ b/indra/llmessage/llcachename.cpp @@ -308,8 +308,10 @@ boost::signals2::connection LLCacheName::addObserver(const LLCacheNameCallback& bool LLCacheName::importFile(std::istream& istr) { LLSD data; - if(LLSDSerialize::fromXMLDocument(data, istr) < 1) + if(LLSDParser::PARSE_FAILURE == LLSDSerialize::fromXMLDocument(data, istr)) + { return false; + } // We'll expire entries more than a week old U32 now = (U32)time(NULL); |