diff options
| author | Cho <cho@lindenlab.com> | 2013-03-14 01:29:58 +0100 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-03-14 01:29:58 +0100 |
| commit | b6d973d31380e7d35f7ed014d682dfc5f2465afe (patch) | |
| tree | 2a67c0e80831528f2cc3141a580a3a5545cc1d85 /indra/llui | |
| parent | 8b388922434e431c49b9e7f2c9d1e8d90d15ed21 (diff) | |
| parent | 8904f32ba48b49ec216a3ca3b1508d5f3f633e78 (diff) | |
merge
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 1 | ||||
| -rw-r--r-- | indra/llui/lltexteditor.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 0f6947ca19..c4ec1edc73 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -2338,7 +2338,6 @@ const LLWString& LLTextBase::getWText() const S32 LLTextBase::getDocIndexFromLocalCoord( S32 local_x, S32 local_y, BOOL round, bool hit_past_end_of_line) const { // Figure out which line we're nearest to. - LLRect visible_region = getVisibleDocumentRect(); LLRect doc_rect = mDocumentView->getRect(); S32 doc_y = local_y - doc_rect.mBottom; 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); |