From 0277259455c4354f81ea8a24c8ab93f27567bc6f Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Wed, 11 Apr 2007 17:54:18 +0000
Subject: svn merge -r 59968:60342
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

---
 indra/llui/lltextbox.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llui/lltextbox.cpp')

diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp
index f6f7067540..2afa32eccd 100644
--- a/indra/llui/lltextbox.cpp
+++ b/indra/llui/lltextbox.cpp
@@ -328,7 +328,7 @@ void LLTextBox::draw()
 void LLTextBox::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
 	// reparse line lengths
-	setText(mText);
+	setLineLengths();
 	LLView::reshape(width, height, called_from_parent);
 }
 
-- 
cgit v1.2.3