diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-01-08 13:40:59 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-01-08 13:40:59 -0600 |
| commit | 954ebaed84f934437fc3a18c937f08fc527359e3 (patch) | |
| tree | 93f6d2c12a93045db66337bdb17167f0b312b785 /indra/llui | |
| parent | 716e2ea3b1e25ac8da64343d02310e8f086c48e7 (diff) | |
| parent | b601bc3cbf5e999b4fd0b0b9ae024397b92cce39 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-tiger
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(); |