diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-04 10:23:22 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-04 10:23:22 -0500 |
| commit | b75fc0af897124a05ab3842bdfc60f428d22e051 (patch) | |
| tree | 3cce57b84110720ea15f370b496d1bc6340a154f /indra/llui | |
| parent | 584b615c3444fdeaa0d41f1d9e839edf1518a310 (diff) | |
| parent | def472b45cb17dd125f802dc3be85450135537a8 (diff) | |
merge up to 3.4.4 beta
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llscrolllistctrl.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 3e0653e9a4..d332aa933e 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -580,6 +580,15 @@ BOOL LLScrollListCtrl::addItem( LLScrollListItem* item, EAddPosition pos, BOOL r addColumn(col_params); } + S32 num_cols = item->getNumColumns(); + S32 i = 0; + for (LLScrollListCell* cell = item->getColumn(i); i < num_cols; cell = item->getColumn(++i)) + { + if (i >= (S32)mColumnsIndexed.size()) break; + + cell->setWidth(mColumnsIndexed[i]->getWidth()); + } + updateLineHeightInsert(item); updateLayout(); |