From 11c53b444d77788044fe0e164fde4364b8206564 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 15 Feb 2012 18:12:26 -0800
Subject: EXP-1884 FIX Errors in navigating text when editing Landmarks and
 picks once a vertical scrollbar is shown fixed horizontal scrollbar showing
 up in local chat

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

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

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 15c2d4946c..7aeeae298f 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1192,7 +1192,10 @@ void LLTextBase::reflow()
 
 		// shrink document to minimum size (visible portion of text widget)
 		// to force inlined widgets with follows set to shrink
-		//mDocumentView->reshape(mVisibleTextRect.getWidth(), mDocumentView->getRect().getHeight());
+		if (mWordWrap)
+		{
+			mDocumentView->reshape(mVisibleTextRect.getWidth(), mDocumentView->getRect().getHeight());
+		}
 
 		S32 cur_top = 0;
 
-- 
cgit v1.2.3