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/llui/llspellcheck.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/llui/llspellcheck.cpp')
| -rw-r--r-- | indra/llui/llspellcheck.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llui/llspellcheck.cpp b/indra/llui/llspellcheck.cpp index a189375fbe..250372da5b 100644 --- a/indra/llui/llspellcheck.cpp +++ b/indra/llui/llspellcheck.cpp @@ -145,10 +145,14 @@ void LLSpellChecker::refreshDictionaryMap() // Load dictionary information (file name, friendly name, ...) llifstream user_file(user_path + DICT_FILE_MAIN, std::ios::binary); - if ( (!user_file.is_open()) || (0 == LLSDSerialize::fromXMLDocument(sDictMap, user_file)) || (0 == sDictMap.size()) ) + if ( (!user_file.is_open()) + || (LLSDParser::PARSE_FAILURE == LLSDSerialize::fromXMLDocument(sDictMap, user_file)) + || (0 == sDictMap.size()) ) { llifstream app_file(app_path + DICT_FILE_MAIN, std::ios::binary); - if ( (!app_file.is_open()) || (0 == LLSDSerialize::fromXMLDocument(sDictMap, app_file)) || (0 == sDictMap.size()) ) + if ( (!app_file.is_open()) + || (LLSDParser::PARSE_FAILURE == LLSDSerialize::fromXMLDocument(sDictMap, app_file)) + || (0 == sDictMap.size()) ) { return; } |