Merge from default branch

--HG--
branch : product-engine

3 files changed, 6 insertions, 10 deletions

diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 6a7eba2712..2240a2146c 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -369,7 +369,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 
 	if (right_x)
 	{
-		*right_x = cur_x / sScaleX;
+		*right_x = (cur_x - origin.mV[VX]) / sScaleX;
 	}
 
 	//FIXME: add underline as glyph?
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index a580345b6c..4bcf7e6980 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1029,8 +1029,10 @@ void LLTextBase::draw()
 	LLUICtrl::draw();
 
 	{
-		// only clip if we support scrolling or have word wrap turned off
-		LLLocalClipRect clip(doc_rect, !getWordWrap() || mScroller != NULL);
+		// only clip if we support scrolling...
+		// since convention is that text boxes never vertically truncate their contents
+		// regardless of rect bounds
+		LLLocalClipRect clip(doc_rect, mScroller != NULL);
 		drawSelectionBackground();
 		drawText();
 		drawCursor();
diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp
index 8ccc5fb248..8c6265fbc2 100644
--- a/indra/newview/llexpandabletextbox.cpp
+++ b/indra/newview/llexpandabletextbox.cpp
@@ -141,13 +141,7 @@ void LLExpandableTextBox::LLTextBoxEx::setText(const LLStringExplicit& text,cons
 	// LLTextBox::setText will obliterate the expander segment, so make sure
 	// we generate it again by clearing mExpanderVisible
 	mExpanderVisible = false;
-
-	// Workaround for EXT-8259: trim text before rendering it.
-	{
-		std::string trimmed_text(text);
-		LLStringUtil::trim(trimmed_text);
-		LLTextEditor::setText(trimmed_text, input_params);
-	}
+	LLTextEditor::setText(text, input_params);
 
 	// text contents have changed, segments are cleared out
 	// so hide the expander and determine if we need it