MAINT-3967 FIXED Up arrow key does not move the cursor up in chat field.

1 files changed, 25 insertions, 4 deletions

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 62edbadb07..183d6481c3 100755
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -225,7 +225,8 @@ LLTextBase::LLTextBase(const LLTextBase::Params &p)
 	mParseHighlights(p.parse_highlights),
 	mBGVisible(p.bg_visible),
 	mScroller(NULL),
-	mStyleDirty(true)
+	mStyleDirty(true),
+	mDrawRightmostCursor(false)
 {
 	if(p.allow_scroll)
 	{
@@ -1510,6 +1511,11 @@ void LLTextBase::reflow()
 		// find and erase line info structs starting at start_index and going to end of document
 		if (!mLineInfoList.empty())
 		{
+			if (mDrawRightmostCursor)
+			{
+				start_index--;
+			}
+
 			// find first element whose end comes after start_index
 			line_list_t::iterator iter = std::upper_bound(mLineInfoList.begin(), mLineInfoList.end(), start_index, line_end_compare());
 			line_start_index = iter->mDocIndexStart;
@@ -1698,6 +1704,11 @@ S32 LLTextBase::getLineNumFromDocIndex( S32 doc_index, bool include_wordwrap) co
 	}
 	else
 	{
+		if (mDrawRightmostCursor)
+		{
+			doc_index--;
+		}
+
 		line_list_t::const_iterator iter = std::upper_bound(mLineInfoList.begin(), mLineInfoList.end(), doc_index, line_end_compare());
 		if (include_wordwrap)
 		{
@@ -1726,6 +1737,11 @@ S32 LLTextBase::getLineOffsetFromDocIndex( S32 startpos, bool include_wordwrap)
 	}
 	else
 	{
+		if (mDrawRightmostCursor)
+		{
+			startpos--;
+		}
+
 		line_list_t::const_iterator iter = std::upper_bound(mLineInfoList.begin(), mLineInfoList.end(), startpos, line_end_compare());
 		return startpos - iter->mDocIndexStart;
 	}
@@ -2445,7 +2461,7 @@ S32 LLTextBase::getDocIndexFromLocalCoord( S32 local_x, S32 local_y, BOOL round,
 		}
 		else if (hit_past_end_of_line && segmentp->getEnd() >= line_iter->mDocIndexEnd)
 		{
-			if (getLineNumFromDocIndex(line_iter->mDocIndexEnd - 1) == line_iter->mLineNum)
+			if (getLineNumFromDocIndex(line_iter->mDocIndexEnd - 1) == line_iter->mLineNum && !mDrawRightmostCursor)
 			{
 				// if segment wraps to the next line we should step one char back
 				// to compensate for the space char between words
@@ -2478,8 +2494,13 @@ LLRect LLTextBase::getDocRectFromDocIndex(S32 pos) const
 	// clamp pos to valid values
 	pos = llclamp(pos, 0, mLineInfoList.back().mDocIndexEnd - 1);
 
-	// find line that contains cursor
-	line_list_t::const_iterator line_iter = std::upper_bound(mLineInfoList.begin(), mLineInfoList.end(), pos, line_end_compare());
+	S32 corrected_pos = pos;
+	if (mDrawRightmostCursor && pos > 0)
+	{
+		corrected_pos--;
+	}
+
+	line_list_t::const_iterator line_iter = std::upper_bound(mLineInfoList.begin(), mLineInfoList.end(), corrected_pos, line_end_compare());
 
 	doc_rect.mLeft = line_iter->mRect.mLeft; 
 	doc_rect.mBottom = line_iter->mRect.mBottom;