FIXED Calling LLTextBase::insertStringNoUndo() with more than one segment results in overlapping segment ranges

Text is only inserted into the view model *after* the segments are added so if seg1_pos_start is the current EOF:
  -> 1st segment: getSegIterContaining(seg1_pos_start) returns the last segment and insertSegment() ends up properly adjusting its start/end position
  -> 2nd segment: getSegIterContaining(seg2_pos_start) returns mSegments.end() since its position is beyond the available and insertSegment() leaves the last 2 segments with overlapping ranges
After the fix:
  -> if index runs past the end of all segments then mSegments.end() is returned (no change)
  -> if index is a position past the length of text but claimed by a segment then that segment is returned (change)
  -> if index specifies a position in the middle of the document unclaimed by any segment then the first segment after that position is returned (no change)
     (this does break the assertion that segment->mStart <= index <= segment->mEnd?)

1 files changed, 0 insertions, 4 deletions

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 64b3a0ddcc..ecceb289f0 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1889,8 +1889,6 @@ LLTextBase::segment_set_t::iterator LLTextBase::getSegIterContaining(S32 index)
 		text_len = mLabel.getWString().length();
 	}
 
-	if (index > text_len) { return mSegments.end(); }
-
 	// when there are no segments, we return the end iterator, which must be checked by caller
 	if (mSegments.size() <= 1) { return mSegments.begin(); }
 
@@ -1914,8 +1912,6 @@ LLTextBase::segment_set_t::const_iterator LLTextBase::getSegIterContaining(S32 i
 		text_len = mLabel.getWString().length();
 	}
 
-	if (index > text_len) { return mSegments.end(); }
-
 	// when there are no segments, we return the end iterator, which must be checked by caller
 	if (mSegments.size() <= 1) { return mSegments.begin(); }