diff options
author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-06-03 15:37:08 +0300 |
---|---|---|
committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-06-03 15:37:08 +0300 |
commit | 9114d7a5243362e26857d40b2df60f3197521efa (patch) | |
tree | 5b898900b27dd367467b3dafc55c2f98e00a8828 | |
parent | 2571b948298cff82b3e3425c5b6b1c3f56caed45 (diff) |
SL-13364 FIXED Viewer crashes when opening Spell Check floater when "SpellCheck" is FALSE
-rwxr-xr-x | doc/contributions.txt | 1 | ||||
-rw-r--r-- | indra/llui/llspellcheck.cpp | 8 | ||||
-rw-r--r-- | indra/llui/llspellcheck.h | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index d7ed345a92..6ce5eac99a 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -223,6 +223,7 @@ Ansariel Hiller MAINT-8723 SL-10385 SL-10891 + SL-13364 Aralara Rajal Arare Chantilly CHUIBUG-191 diff --git a/indra/llui/llspellcheck.cpp b/indra/llui/llspellcheck.cpp index 296ea09079..ebd8ca0923 100644 --- a/indra/llui/llspellcheck.cpp +++ b/indra/llui/llspellcheck.cpp @@ -49,8 +49,6 @@ LLSpellChecker::settings_change_signal_t LLSpellChecker::sSettingsChangeSignal; LLSpellChecker::LLSpellChecker() : mHunspell(NULL) { - // Load initial dictionary information - refreshDictionaryMap(); } LLSpellChecker::~LLSpellChecker() @@ -58,6 +56,12 @@ LLSpellChecker::~LLSpellChecker() delete mHunspell; } +void LLSpellChecker::initSingleton() +{ + // Load initial dictionary information + refreshDictionaryMap(); +} + bool LLSpellChecker::checkSpelling(const std::string& word) const { if ( (!mHunspell) || (word.length() < 3) || (0 != mHunspell->spell(word.c_str())) ) diff --git a/indra/llui/llspellcheck.h b/indra/llui/llspellcheck.h index f1964cc091..3da5e30955 100644 --- a/indra/llui/llspellcheck.h +++ b/indra/llui/llspellcheck.h @@ -47,6 +47,7 @@ public: protected: void addToDictFile(const std::string& dict_path, const std::string& word); void initHunspell(const std::string& dict_language); + void initSingleton(); public: typedef std::list<std::string> dict_list_t; |