diff options
author | Oz Linden <oz@lindenlab.com> | 2012-05-08 15:51:56 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-05-08 15:51:56 -0400 |
commit | 95090c5d1e857130f7266b5753d3650d02e9386c (patch) | |
tree | cff60656371883829dd7451ed4a1d3d09258b5ae /indra/llui/lltexteditor.cpp | |
parent | 5bf742895d882f1d7178c2b18a347bf485877a02 (diff) | |
parent | d6569db3520f7e0ce2d93febb6f4e26b48c08a3d (diff) |
merge changes for version 3.3.1
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
-rw-r--r-- | indra/llui/lltexteditor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index c5957838ba..48dd8dcef9 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -2021,7 +2021,7 @@ void LLTextEditor::drawPreeditMarker() return; } - const S32 line_height = llround( mDefaultFont->getLineHeight() ); + const S32 line_height = mDefaultFont->getLineHeight(); S32 line_start = getLineStart(cur_line); S32 line_y = mVisibleTextRect.mTop - line_height; @@ -2744,7 +2744,7 @@ BOOL LLTextEditor::getPreeditLocation(S32 query_offset, LLCoordGL *coord, LLRect const LLWString textString(getWText()); const llwchar * const text = textString.c_str(); - const S32 line_height = llround(mDefaultFont->getLineHeight()); + const S32 line_height = mDefaultFont->getLineHeight(); if (coord) { @@ -2847,7 +2847,7 @@ void LLTextEditor::markAsPreedit(S32 position, S32 length) S32 LLTextEditor::getPreeditFontSize() const { - return llround(mDefaultFont->getLineHeight() * LLUI::sGLScaleFactor.mV[VY]); + return llround((F32)mDefaultFont->getLineHeight() * LLUI::sGLScaleFactor.mV[VY]); } BOOL LLTextEditor::isDirty() const |