diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-12-13 14:37:54 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-12-13 14:37:54 -0500 |
| commit | 83a95325f82bbb5a2b0451d0c4ce8a3ff576b8d0 (patch) | |
| tree | ab2020adb172b4dd686ba673ec099c667feabc5d /indra | |
| parent | a334f41f8ebec5ef812334e5086e54256e2bf7df (diff) | |
| parent | ef07952d0d165cad1a3d5b3ee3ad981b6a6a4832 (diff) | |
merge changes for DRTVWR-265
Diffstat (limited to 'indra')
| -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(); |