diff options
| author | Ima Mechanique <ima.mechanique@secondlife.com> | 2013-02-05 16:37:37 +0000 |
|---|---|---|
| committer | Ima Mechanique <ima.mechanique@secondlife.com> | 2013-02-05 16:37:37 +0000 |
| commit | 7183cecd14fbdc3cd31e1482248fabec7b23b1fb (patch) | |
| tree | 9f07e2451567e217de1238af2cb4afbe568c9498 /indra/llui/lltexteditor.cpp | |
| parent | 1407f4f11a911d1853114af5c140d3fa0b73f14a (diff) | |
STORM-1831 merging in previous work
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
| -rw-r--r-- | indra/llui/lltexteditor.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index 144b6960a1..1728292a6b 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -2416,14 +2416,8 @@ void LLTextEditor::loadKeywords(const std::string& filename, const LLColor3& color) { LLFastTimer ft(FTM_SYNTAX_HIGHLIGHTING); - if(mKeywords.loadFromFile(filename)) + if(mKeywords.loadFromFile()) { - S32 count = llmin(funcs.size(), tooltips.size()); - for(S32 i = 0; i < count; i++) - { - std::string name = utf8str_trim(funcs[i]); - mKeywords.addToken(LLKeywordToken::WORD, name, color, tooltips[i] ); - } segment_vec_t segment_list; mKeywords.findSegments(&segment_list, getWText(), mDefaultColor.get(), *this); |