diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-12-18 21:57:25 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-12-18 21:57:25 +0100 |
| commit | c309a7bd9446cc942830998b1f5873cc62e9dffb (patch) | |
| tree | bbfe0d41ebc7e303db1bd95c419f604e04fb9ab2 /indra/llui | |
| parent | ca790f7320c9fc6c43e8c6022c9e511a85fd1c9d (diff) | |
| parent | 3feacc96c6cf87f1be034312d8c71d21bae88351 (diff) | |
Merge with viewer-materials tip
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(); |