summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2012-02-02 13:29:24 +0200
committerVadim ProductEngine <vsavchuk@productengine.com>2012-02-02 13:29:24 +0200
commit8d6665b5c2ac1d42d72dab025623d3ae14291ccb (patch)
treec74ff37fce1966b1474d2d91616930e7efce458b
parent174aa75799e608f951d3463f953c91968b868ef6 (diff)
Restoring a call to llround() in lllineeditor.cpp mistakenly removed in changeset 0a9ef58e8f7d.
By the way, removing a pointless call to llround() in lldraghandle.cpp.
-rw-r--r--indra/llui/lldraghandle.cpp2
-rw-r--r--indra/llui/lllineeditor.cpp2
2 files changed, 2 insertions, 2 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 c53fb40ca2..d600f58b96 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 = (background.getHeight() - mGLFont->getLineHeight())/2;
+ S32 lineeditor_v_pad = llround(((F32)background.getHeight() - mGLFont->getLineHeight())/2);
drawBackground();