From 89434ef6e64462041368ab26e049011fc84ae1e3 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Tue, 4 Aug 2009 01:39:33 +0000
Subject: [PATCH] fix for broken build
---
indra/llui/lltexteditor.cpp | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 547461f22af..48816e4b9e5 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -389,15 +389,6 @@ void LLTextEditor::setThumbColor( const LLColor4& color )
mScrollbar->setThumbColor(color);
}
-struct LLTextEditor::pred
-{
- bool operator()(const std::pair<S32, S32>& b, const LLTextEditor::line_info& a)
- {
- return a.mSegment > 0;
- }
-
-};
-
void LLTextEditor::updateLineStartList(S32 startpos)
{
updateSegments();
@@ -413,7 +404,7 @@ void LLTextEditor::updateLineStartList(S32 startpos)
{
getSegmentAndOffset(startpos, &seg_idx, &seg_offset);
line_info t(seg_idx, seg_offset);
- line_list_t::iterator iter = std::upper_bound(mLineStartList.begin(), mLineStartList.end(), std::make_pair(seg_idx, seg_offset), pred());
+ line_list_t::iterator iter = std::upper_bound(mLineStartList.begin(), mLineStartList.end(), t, line_info_compare());
if (iter != mLineStartList.begin()) --iter;
seg_idx = iter->mSegment;
seg_offset = iter->mOffset;
--
GitLab