diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-12-17 18:16:06 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-12-17 18:16:06 -0800 |
| commit | 4745afe679b0b835d602b22ea0df1b7e918888ac (patch) | |
| tree | 7936879973a456e01d94a80b791c21e78c89fba7 /indra/llui/llscrolllistctrl.cpp | |
| parent | 74d3dc41fb7e24410ba052a9c5ce2867fbdb9c0a (diff) | |
| parent | 1be900c1531e44c32fd8fd64e79aeb44e53a3c43 (diff) | |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
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 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(); |