diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2012-02-01 16:39:06 +0200 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2012-02-01 16:39:06 +0200 |
| commit | 1404ba1ffa821c3ecc76cde254c5148fec66a2c0 (patch) | |
| tree | 854ae53aefdd185ccd8ec7de422179933104288d /indra | |
| parent | 178b30601b989aa98644c4e5c2ebcd9cd75490f7 (diff) | |
fixed Linux build
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/lldraghandle.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/lllineeditor.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/llmenugl.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/lldraghandle.cpp b/indra/llui/lldraghandle.cpp index 42e6c3c786..5f69c6af31 100644 --- a/indra/llui/lldraghandle.cpp +++ b/indra/llui/lldraghandle.cpp @@ -244,7 +244,7 @@ void LLDragHandleTop::reshapeTitleBox() const LLFontGL* font = LLFontGL::getFontSansSerif(); S32 title_width = getRect().getWidth(); title_width -= LEFT_PAD + 2 * BORDER_PAD + getButtonsRect().getWidth(); - S32 title_height = llround(font->getLineHeight()); + S32 title_height = font->getLineHeight(); LLRect title_rect; title_rect.setLeftTopAndSize( LEFT_PAD, diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index 06dfc90d83..c53fb40ca2 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -1630,7 +1630,7 @@ void LLLineEditor::draw() LLRect background( 0, getRect().getHeight(), getRect().getWidth(), 0 ); background.stretch( -mBorderThickness ); - S32 lineeditor_v_pad = llround((background.getHeight() - mGLFont->getLineHeight())/2); + S32 lineeditor_v_pad = (background.getHeight() - mGLFont->getLineHeight())/2; drawBackground(); diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 1db1dac2ec..3e547efd97 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -317,7 +317,7 @@ void LLMenuItemGL::setJumpKey(KEY key) // virtual U32 LLMenuItemGL::getNominalHeight( void ) const { - return llround(mFont->getLineHeight()) + MENU_ITEM_PADDING; + return mFont->getLineHeight() + MENU_ITEM_PADDING; } //virtual |