diff options
| author | James Cook <james@lindenlab.com> | 2010-03-10 15:46:45 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-03-10 15:46:45 -0800 |
| commit | 60799effaee5dd9696704342e9c8a35881d22583 (patch) | |
| tree | 28a10ccdc563ca4795d4018270ef36d50a6c3a1c /indra/llui/llscrolllistctrl.cpp | |
| parent | 0ee6a6025cba2f63c5c33c20870f67afd62f6372 (diff) | |
| parent | 347585cf975afac59ec6b9960e093acd015627f5 (diff) | |
Merge
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
| -rw-r--r-- | indra/llui/llscrolllistctrl.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 18ec5b51dd..77caaaa425 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -630,9 +630,7 @@ void LLScrollListCtrl::calcColumnWidths() LLScrollListCell* cellp = (*iter)->getColumn(column->mIndex); if (!cellp) continue; - // get text value width only for text cells - column->mMaxContentWidth = cellp->isText() ? - llmax(LLFontGL::getFontSansSerifSmall()->getWidth(cellp->getValue().asString()) + mColumnPadding + COLUMN_TEXT_PADDING, column->mMaxContentWidth) : column->mMaxContentWidth; + column->mMaxContentWidth = llmax(LLFontGL::getFontSansSerifSmall()->getWidth(cellp->getValue().asString()) + mColumnPadding + COLUMN_TEXT_PADDING, column->mMaxContentWidth); } max_item_width += column->mMaxContentWidth; |