diff options
| author | Don Kjer <don@lindenlab.com> | 2013-03-05 22:05:22 -0800 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2013-03-05 22:05:22 -0800 |
| commit | 54cdc322b8f2bd35b289cacf3493622e7cc51194 (patch) | |
| tree | 4f686cdfbaaf8819dfb1b015a1c8388ea1f59eac /indra/llmessage/llcachename.cpp | |
| parent | 9a0c52a247ecbd79f5f872ceb97a6be3e0499bea (diff) | |
Fixing issues with not detecting when LLSD XML parsing fails. Changing most http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam.
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 8f4af1984c..d9eb65ff59 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); |