diff options
| author | Richard Linden <none@none> | 2010-06-02 15:33:37 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-06-02 15:33:37 -0700 |
| commit | 6d69f054785ea16c2c1cb6c091328140f2504089 (patch) | |
| tree | 5c0b7eb13d337aa223175468a926aa9e64594476 /indra/llui/lltextbase.cpp | |
| parent | 1e13fd9260696e10df05dcb81803649c805b95cd (diff) | |
| parent | a541c1d53ed2e7bce713b742684d5e16320d8100 (diff) | |
merge
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 616033f77f..f0a8f70ae5 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1704,13 +1704,11 @@ void LLTextBase::appendAndHighlightText(const std::string &new_text, bool prepen setCursorPos(old_length); - LLTextParser* highlight = LLTextParser::getInstance(); - - if (mParseHighlights && highlight) + if (mParseHighlights) { LLStyle::Params highlight_params(style_params); - LLSD pieces = highlight->parsePartialLineHighlights(new_text, highlight_params.color(), (LLTextParser::EHighlightPosition)highlight_part); + LLSD pieces = LLTextParser::instance().parsePartialLineHighlights(new_text, highlight_params.color(), (LLTextParser::EHighlightPosition)highlight_part); for (S32 i = 0; i < pieces.size(); i++) { LLSD color_llsd = pieces[i]["color"]; |