diff options
| author | prep <prep@lindenlab.com> | 2013-03-11 14:45:53 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2013-03-11 14:45:53 -0400 |
| commit | 207d9fd767895a3470722fb298eeef4f338e479a (patch) | |
| tree | 050b5c2c1d88b910aeebe8c8be04c19f548bb123 /indra/llmessage/llcachename.cpp | |
| parent | 82c92ce5a97d6a83505c775348aef692e18e42ed (diff) | |
| parent | fe042430b03667abcd6b72ef9cc27d82d85f4242 (diff) | |
Viewer-chui 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); |