diff options
author | dolphin <dolphin@lindenlab.com> | 2013-01-02 09:47:17 -0800 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-01-02 09:47:17 -0800 |
commit | e018720278af674528f43acc40af40a1d3d64e7d (patch) | |
tree | 8f5e789148654315283d9ac5b74f89c15a7fa42d /indra/llui | |
parent | 179e944f45476e03eb7b828e427f9d299529ad12 (diff) | |
parent | cd1871d2e39bfee8a6e5bc61ece40a764ff7cdb4 (diff) |
Merge
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(); |