diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-17 12:47:47 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-17 12:47:47 +0200 |
| commit | b53e60b8574eecb583aa3a0902280849f53012ea (patch) | |
| tree | 4ba57cc934b09e4119797606834cfc46805032cf /indra/newview/llfolderview.cpp | |
| parent | 09a509e0073a1daa5eadf1b5bf5bdef24080ab47 (diff) | |
| parent | 9cfc4c07267234ee4f218d100f7d4f27d6e3e000 (diff) | |
Merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index e21587a934..68faaeaa0b 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -236,9 +236,9 @@ LLFolderView::LLFolderView(const Params& p) LLTextBox::Params text_p; LLFontGL* font = getLabelFontForStyle(mLabelStyle); LLRect new_r = LLRect(rect.mLeft + ICON_PAD, - rect.mTop - TEXT_PAD, - rect.mRight, - rect.mTop - TEXT_PAD - (S32)font->getLineHeight()); + rect.mTop - TEXT_PAD, + rect.mRight, + rect.mTop - TEXT_PAD - llfloor(font->getLineHeight())); text_p.rect(new_r); text_p.name(std::string(p.name)); text_p.font(font); |