diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-23 10:44:45 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-23 10:44:45 +0100 |
| commit | 4bec811062ddf9cef5f925c4f7f814392935b7e9 (patch) | |
| tree | ca209e70a1adbfb7875e74d6ce36c56409f6e597 /indra/llui | |
| parent | b99c90daf38765161eafec418d52493761baf872 (diff) | |
| parent | bb908fb73ee720898a22bda2119e3435992f0fef (diff) | |
merge from PE's viewer-trunk
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llscrolllistctrl.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index db0f2bd6e2..94eade06ad 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -282,6 +282,8 @@ LLScrollListCtrl::LLScrollListCtrl(const LLScrollListCtrl::Params& p) text_p.border_visible(false); text_p.rect(mItemListRect); text_p.follows.flags(FOLLOWS_ALL); + // word wrap was added accroding to the EXT-6841 + text_p.wrap(true); addChild(LLUICtrlFactory::create<LLTextBox>(text_p)); } |