diff options
| author | Richard Linden <none@none> | 2012-02-23 12:40:27 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-23 12:40:27 -0800 |
| commit | f4a122b6d72bdc2dc482fb04475703ffa5a00219 (patch) | |
| tree | 0155d0d080b42740666564ed9f02b9d33069a4e5 /indra/llui | |
| parent | a5e4b15b7d29a64781eb32ef71e557a5bb8dc870 (diff) | |
| parent | 48bc2a7c9f6175a5c3179f6fccc98c3d3c50a4c9 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 5 |
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; |