diff options
author | Oz Linden <oz@lindenlab.com> | 2013-03-15 15:42:21 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-03-15 15:42:21 -0400 |
commit | a625dbe35ebaf63ad093aedce49a042ee790fe3c (patch) | |
tree | f78e643bae9590262bce94681376254436140e2c /indra/llui/lltexteditor.cpp | |
parent | 75722baf295aff7927bff3c70cdf0ec27399cb37 (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 646786d4cf..57446e9c56 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -2523,7 +2523,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); |