diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-12-13 18:18:39 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-12-13 18:18:39 -0500 |
| commit | 83299b56c4a9922a2dfa141f2ff45f3d52883c07 (patch) | |
| tree | 9eb513f813ce4d17fa89c88388f66a73b52b4e1f /indra/llui | |
| parent | edcdce226a7ff599e43c89fe7e4d37350650ae96 (diff) | |
| parent | 9f1b484817840cc8f185090f2e8b7bdee441ea7a (diff) | |
merge fixes from 3.4.3-beta3
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(); |