summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-02-15 18:12:26 -0800
committerRichard Linden <none@none>2012-02-15 18:12:26 -0800
commit11c53b444d77788044fe0e164fde4364b8206564 (patch)
tree1641a2a8ec28319f592eb43c4fe282e2ba57f7a6 /indra
parent51a8134f62ff0705ede2534945e808ccbd9d6b7e (diff)
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
Diffstat (limited to 'indra')
-rw-r--r--indra/llui/lltextbase.cpp5
1 files changed, 4 insertions, 1 deletions
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;