diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-01 09:27:23 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-01 09:27:23 -0400 |
| commit | 3329291a5ef392bf822d8163b0a7e2c88b2e7965 (patch) | |
| tree | 0514b85339dc9c4e07d9d556ff566f3953df5283 | |
| parent | 5e5dbd718e65dc30365bf435a7a865e7f95096cc (diff) | |
| parent | 17605cc894ad458915d958919554345334892eb0 (diff) | |
merge latest fixes from Kitty
| -rw-r--r-- | indra/llui/lllineeditor.cpp | 4 | ||||
| -rw-r--r-- | indra/llui/llspellcheck.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index acdcd38c24..8fc0465acf 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -1889,7 +1889,7 @@ void LLLineEditor::draw() // Calculate start and end indices for the first and last visible word U32 start = prevWordPos(mScrollHPos), end = nextWordPos(mScrollHPos + rendered_text); - if ( (mSpellCheckStart != start) || (mSpellCheckEnd = end) ) + if ( (mSpellCheckStart != start) || (mSpellCheckEnd != end) ) { const LLWString& text = mText.getWString().substr(start, end); @@ -1911,7 +1911,7 @@ void LLLineEditor::draw() { word_end++; } - if (word_end >= text.length()) + if (word_end > text.length()) break; // Don't process words shorter than 3 characters diff --git a/indra/llui/llspellcheck.cpp b/indra/llui/llspellcheck.cpp index aa39e21a96..bde3b56741 100644 --- a/indra/llui/llspellcheck.cpp +++ b/indra/llui/llspellcheck.cpp @@ -142,7 +142,7 @@ void LLSpellChecker::addToIgnoreList(const std::string& word) { std::string word_lower(word); LLStringUtil::toLower(word_lower); - if (mIgnoreList.end() != std::find(mIgnoreList.begin(), mIgnoreList.end(), word_lower)) + if (mIgnoreList.end() == std::find(mIgnoreList.begin(), mIgnoreList.end(), word_lower)) { mIgnoreList.push_back(word_lower); addToDictFile(getDictionaryUserPath() + mDictFile + DICT_IGNORE_SUFFIX + ".dic", word_lower); |