diff options
author | Oz Linden <oz@lindenlab.com> | 2013-03-13 19:09:00 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-03-13 19:09:00 -0400 |
commit | bf95c1cae7a84d1a97dacd8ea7f1b6af8be067a9 (patch) | |
tree | 85a0f5fef2af8276cf99388a46193624838dfb6b /indra/llui/lltexteditor.cpp | |
parent | d348deb7049cbaef7c228000525c7ee5a265464c (diff) | |
parent | 04e78ce4fdd3bbc0e4daa1daabbff2de1c425601 (diff) |
merge changes for 3.5.0-beta3
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
-rw-r--r-- | indra/llui/lltexteditor.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index 2f120479d9..d5e08fa29b 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -2515,7 +2515,6 @@ void LLTextEditor::updateSegments() mKeywords.findSegments(&segment_list, getWText(), mDefaultColor.get(), *this); clearSegments(); - segment_set_t::iterator insert_it = mSegments.begin(); for (segment_vec_t::iterator list_it = segment_list.begin(); list_it != segment_list.end(); ++list_it) { insertSegment(*list_it); |