diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-23 14:08:11 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-23 14:08:11 +0000 |
| commit | e7d9999359dd62509c685181d620b092ed28bc60 (patch) | |
| tree | 595bc367bef76b80d04f7e3e7d95dfbeb31a13cd /indra/llui/llscrolllistctrl.cpp | |
| parent | 11e6e208d43f1347037fb312921a65af138f47b4 (diff) | |
| parent | af77b7713444b9df58f451bdb1f30bdd4754fcbf (diff) | |
Merge from viewer-2-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; |