diff options
| author | Don Kjer <don@lindenlab.com> | 2013-03-13 21:01:50 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2013-03-13 21:01:50 +0000 |
| commit | 9150757c8179f06058c41b967a69f95e03c3e619 (patch) | |
| tree | dae8603163e590907b034cc8651db267026a13d3 /indra/llui | |
| parent | cec50f8c142f4ff5f8358d9fa27884dd14f77eff (diff) | |
More fixes for gcc-4.6 breakage
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 7 | ||||
| -rw-r--r-- | indra/llui/llui.h | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index e22b806a74..49f0cb7dc8 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -380,7 +380,7 @@ void LLTextBase::drawSelectionBackground() S32 segment_offset; getSegmentAndOffset(line_iter->mDocIndexStart, &segment_iter, &segment_offset); - LLRect selection_rect; + //LLRect selection_rect; selection_rect.mLeft = line_iter->mRect.mLeft; selection_rect.mRight = line_iter->mRect.mLeft; selection_rect.mBottom = line_iter->mRect.mBottom; @@ -443,7 +443,8 @@ void LLTextBase::drawSelectionBackground() rect_it != selection_rects.end(); ++rect_it) { - LLRect selection_rect = *rect_it; + //LLRect selection_rect = *rect_it; + selection_rect = *rect_it; selection_rect.translate(mVisibleTextRect.mLeft - content_display_rect.mLeft, mVisibleTextRect.mBottom - content_display_rect.mBottom); gl_rect_2d(selection_rect, selection_color); } @@ -2329,7 +2330,7 @@ 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 visible_region = getVisibleDocumentRect(); LLRect doc_rect = mDocumentView->getRect(); S32 doc_y = local_y - doc_rect.mBottom; diff --git a/indra/llui/llui.h b/indra/llui/llui.h index 83831e4799..0a0e0e164e 100644 --- a/indra/llui/llui.h +++ b/indra/llui/llui.h @@ -343,10 +343,11 @@ public: // this avoids a MSVC bug where non-referenced static members are "optimized" away // even if their constructors have side effects - void reference() + S32 reference() { S32 dummy; dummy = 0; + return dummy; } }; |