Skip to content
Snippets Groups Projects
Commit 83a95325 authored by Oz Linden's avatar Oz Linden
Browse files

merge changes for DRTVWR-265

parents a334f41f ef07952d
No related branches found
No related tags found
No related merge requests found
...@@ -372,3 +372,4 @@ ab0aa2f6ba22b52fed30a2337197f589156edc75 DRTVWR-253 ...@@ -372,3 +372,4 @@ ab0aa2f6ba22b52fed30a2337197f589156edc75 DRTVWR-253
c23d734065ed593b2413385aecd8366d8e0ee96b DRTVWR-257 c23d734065ed593b2413385aecd8366d8e0ee96b DRTVWR-257
452ce96d4046dc05a3ecaecc203e2cc8ddd72e76 DRTVWR-259 452ce96d4046dc05a3ecaecc203e2cc8ddd72e76 DRTVWR-259
5cba5f39d0a81d659f24ebc4b5efd025a39e3db1 3.4.3-release 5cba5f39d0a81d659f24ebc4b5efd025a39e3db1 3.4.3-release
daca610d840625b5bebb966a57cb49581852c417 DRTVWR-265
...@@ -580,6 +580,15 @@ BOOL LLScrollListCtrl::addItem( LLScrollListItem* item, EAddPosition pos, BOOL r ...@@ -580,6 +580,15 @@ BOOL LLScrollListCtrl::addItem( LLScrollListItem* item, EAddPosition pos, BOOL r
addColumn(col_params); 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); updateLineHeightInsert(item);
updateLayout(); updateLayout();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment