Automated merge with ssh://hg.lindenlab.com/viewer/login-api/

1 files changed, 6 insertions, 11 deletions

diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 983777b747..8d5f277b59 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -1120,21 +1120,12 @@ void LLTextEditor::updateCursorXPos()
 }
 
 // constraint cursor to editable segments of document
+// NOTE: index must be within document range
 S32 LLTextEditor::getEditableIndex(S32 index, bool increasing_direction)
 {
-	//// always allow editable position at end of doc
-	//if (index == getLength())
-	//{
-	//	return index;
-	//}
-
 	segment_set_t::iterator segment_iter;
 	S32 offset;
 	getSegmentAndOffset(index, &segment_iter, &offset);
-	if (segment_iter == mSegments.end())
-	{
-		return 0;
-	}
 
 	LLTextSegmentPtr segmentp = *segment_iter;
 
@@ -3194,7 +3185,11 @@ void LLTextEditor::draw()
 	drawLineNumbers();
 
 	{
-		LLLocalClipRect clip(mTextRect);
+		// pad clipping rectangle so that cursor can draw at full width
+		// when at left edge of mTextRect
+		LLRect clip_rect(mTextRect);
+		clip_rect.stretch(1);
+		LLLocalClipRect clip(clip_rect);
 		drawSelectionBackground();
 		drawPreeditMarker();
 		drawText();