diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-01 09:34:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-01 09:34:41 -0400 |
| commit | 90b56ee9fa95ca8cc15e3abc81977f504eb32c5b (patch) | |
| tree | 581e4ba644ebf770dbdab292ea9f10d4b9404cb6 /indra/llui/lltextbase.cpp | |
| parent | 130e4e510198147664a2377b62b22d8e42f00f04 (diff) | |
| parent | 49bef4e122e3ab4c82962e25f4ec1803c4e0c600 (diff) | |
merge changes for 3.5.0-beta7
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 270d5294f9..a815cfc176 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -3490,3 +3490,7 @@ F32 LLImageTextSegment::draw(S32 start, S32 end, S32 selection_start, S32 select return 0.0; } +void LLTextBase::setWordWrap(bool wrap) +{ + mWordWrap = wrap; +} |