diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-19 13:21:52 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-19 13:21:52 -0400 |
| commit | a3a430651780f82afb0fd355a0abe11d88f410d6 (patch) | |
| tree | a2ec3b87b2bff75904be0e7a6bf38d17c59edb68 /indra/llui/llscrolllistctrl.cpp | |
| parent | b952a5e5851d1a8bc2a45f00248b051497fec71f (diff) | |
| parent | f50be64167c254e27f635ad47d8940551f0c6ab4 (diff) | |
automated merge viewer2.0->viewer2.0
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; |