diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-29 20:33:40 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-29 20:33:40 +0100 |
| commit | b2fc82cb14654b4dbca5a55e66313babf82f77b3 (patch) | |
| tree | 1cbc068c31f936415b909257b9c3341b55eb578b /indra/llui/lltextbase.cpp | |
| parent | d4657fd42bf2d60b068b9b6fd7f758a2094d48d3 (diff) | |
| parent | 5b609171ffcb25bb38dc684c92d9beb958eb314c (diff) | |
merge
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index a580345b6c..4bcf7e6980 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1029,8 +1029,10 @@ void LLTextBase::draw() LLUICtrl::draw(); { - // only clip if we support scrolling or have word wrap turned off - LLLocalClipRect clip(doc_rect, !getWordWrap() || mScroller != NULL); + // only clip if we support scrolling... + // since convention is that text boxes never vertically truncate their contents + // regardless of rect bounds + LLLocalClipRect clip(doc_rect, mScroller != NULL); drawSelectionBackground(); drawText(); drawCursor(); |