diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-02-17 14:43:04 +0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-02-17 14:43:04 +0800 |
| commit | 3f623398ee0d14520e5a2af1e7719d19a57d1a74 (patch) | |
| tree | b41e58bde3eb2fbe8c08628aa7cc973f2181d100 /indra | |
| parent | c264ffe8153d9c8daf9c6db962a7a71ca43ecac3 (diff) | |
| parent | 935d12277c7b8e6cee605e89c3904c3ba5b6c3f6 (diff) | |
Merge
Diffstat (limited to 'indra')
| -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); |