diff options
| author | Richard Linden <none@none> | 2010-03-09 12:16:44 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-03-09 12:16:44 -0800 |
| commit | b51515100c75b737c144834d8efd594c3fe9ae69 (patch) | |
| tree | 2254503b48a169162d382d7e2183baa8d8578bc4 /indra/llui/llscrolllistctrl.cpp | |
| parent | f1a58bd14ec774047c0cc5b9b65883cc6d03405a (diff) | |
rolled back changeset 5fbab7aa32ef to fix EXT-6269
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; |