diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-02 12:14:44 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-02 12:14:44 -0400 |
| commit | 699fe4369949ba03959312c90335ac37d80ac275 (patch) | |
| tree | 715cca856cf96328a37a5ba3e83e20c171893655 /indra/llui/lltextbase.cpp | |
| parent | effaca51841d6f07403b196a8d972861bb7e0f05 (diff) | |
| parent | 90b56ee9fa95ca8cc15e3abc81977f504eb32c5b (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; +} |