From 4885ddab8d729dd036155e479f1ce2221074a4ac Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Wed, 25 Nov 2009 19:55:24 -0800
Subject: EXT-1944 -  Implement ellipsis in message well EXT-699 - Toasts
 should display maximum 6 lines of text before ellipses are applied EXT-2453 -
 TextBox displays an extra line of text

---
 indra/llui/lltextbase.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra/llui/lltextbase.h')

diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index c376a73615..c60b040655 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -84,11 +84,13 @@ public:
 								wrap,
 								use_ellipses,
 								allow_html,
-								parse_highlights;
+								parse_highlights,
+								clip_partial;
 								
 		Optional<S32>			v_pad,
 								h_pad;
 
+
 		Optional<LineSpacingParams>
 								line_spacing;
 
@@ -347,6 +349,7 @@ protected:
 	bool						mTrackEnd;			// if true, keeps scroll position at end of document during resize
 	bool						mReadOnly;
 	bool						mBGVisible;			// render background?
+	bool						mClipPartial;		// false if we show lines that are partially inside bounding rect
 	S32							mMaxTextByteLength;	// Maximum length mText is allowed to be in bytes
 
 	// support widgets
-- 
cgit v1.2.3