diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:58:50 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:58:50 -0500 |
| commit | 633bd44b4a9dbf7f4f262929b28848e04b446b26 (patch) | |
| tree | dc3261611d5b07282c9a4210d49893be779c7d2a /indra/newview/lltexturectrl.cpp | |
| parent | 35dd27d5e57b2957aaa904cce841fccd4cfff850 (diff) | |
| parent | 1b624f5ea686292652978c72d39e5546efe23d0f (diff) | |
merge changes for vmrg-225
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 ddedb1dcfb..19a944e88e 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"); |