diff options
| author | Richard Linden <none@none> | 2010-06-02 14:46:18 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-06-02 14:46:18 -0700 |
| commit | 2d107f4349cfcc3fe2b59a0d95ee75ee50134205 (patch) | |
| tree | f155e3d39d220443b389f65c29e0c909373102d1 /indra/llui/lltextbase.cpp | |
| parent | c1aaca36aefff1154a2cd0069d46d466ce39b83a (diff) | |
| parent | 141ea0f89628c92959c21b949fd2ff7a9cb50d9f (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"]; |