merge

1 files changed, 4 insertions, 2 deletions

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();