diff options
| author | Richard Linden <none@none> | 2012-02-06 15:28:45 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-06 15:28:45 -0800 |
| commit | 2ed1de224a45fafb12fea42e8dfb83f9728cdcf1 (patch) | |
| tree | a78f96c5ada866ec93cbba72f2c7bf1daf7ade80 /indra/newview/lltexturectrl.cpp | |
| parent | 289d756ea86bd3898f41592146d8f549cd056846 (diff) | |
| parent | e328dcf4062177c903d3099d0d16477824d23025 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index de22f2ae6b..e26d2e001c 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -922,7 +922,7 @@ LLTextureCtrl::LLTextureCtrl(const LLTextureCtrl::Params& p) S32 image_top = getRect().getHeight(); S32 image_bottom = BTN_HEIGHT_SMALL; S32 image_middle = (image_top + image_bottom) / 2; - S32 line_height = llround(LLFontGL::getFontSansSerifSmall()->getLineHeight()); + S32 line_height = LLFontGL::getFontSansSerifSmall()->getLineHeight(); LLTextBox::Params tentative_label_p(p.multiselect_text); tentative_label_p.name("Multiple"); |