diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-14 16:02:15 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-14 16:02:15 -0800 |
| commit | 080a77a0d98905b2eccf9a0a30dbcd691dab83bd (patch) | |
| tree | 77d083e0b837c7a6000b651a3e11015f74824347 /indra/llui/llscrolllistctrl.cpp | |
| parent | 68b61bdec620014f30d6e9c63726d96fa7f4382a (diff) | |
| parent | 56b23a8727af34d950e217affa784d322b737cc3 (diff) | |
mergiing in latest changes
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
| -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 7ed7042aff..2bd2294ea2 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(); |