diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-17 13:50:26 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-17 13:50:26 +0000 |
| commit | 2398ac98d01d3809904759251e2c98cf2740e139 (patch) | |
| tree | 644f663d08e39275f76e19a1cab4d34e3cdf75cf /indra/llui/lltexteditor.cpp | |
| parent | e2d56363f105f8bef2b05a6bd4c5276db9a60d82 (diff) | |
| parent | c3bd736f6c2d51542fb2894542151282144e7388 (diff) | |
merge from viewer2.
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
| -rw-r--r-- | indra/llui/lltexteditor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index ce5f1bd082..7d230f7d42 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -2524,9 +2524,9 @@ void LLTextEditor::loadKeywords(const std::string& filename, void LLTextEditor::updateSegments() { - LLFastTimer ft(FTM_SYNTAX_HIGHLIGHTING); - if (mKeywords.isLoaded()) + if (mReflowIndex < S32_MAX && mKeywords.isLoaded()) { + LLFastTimer ft(FTM_SYNTAX_HIGHLIGHTING); // HACK: No non-ascii keywords for now segment_vec_t segment_list; mKeywords.findSegments(&segment_list, getWText(), mDefaultColor.get(), *this); |