diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-17 12:47:47 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-17 12:47:47 +0200 |
| commit | b53e60b8574eecb583aa3a0902280849f53012ea (patch) | |
| tree | 4ba57cc934b09e4119797606834cfc46805032cf /indra/llui/lltexteditor.cpp | |
| parent | 09a509e0073a1daa5eadf1b5bf5bdef24080ab47 (diff) | |
| parent | 9cfc4c07267234ee4f218d100f7d4f27d6e3e000 (diff) | |
Merge from default branch.
--HG--
branch : product-engine
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); |