diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-18 11:39:21 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-18 11:39:21 -0400 |
| commit | 605a99010fb534868e4c0abef1da09c8bcfbb884 (patch) | |
| tree | 77369edeba6a0e29fce278173b0ba0322f2d965b /indra/llui/lltexteditor.cpp | |
| parent | dd1f89d3a9316a8486460f7f354d54083c8ca688 (diff) | |
| parent | 34181d1566d91c8e5d659db0f64d6989c824fa1f (diff) | |
merge
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
| -rw-r--r-- | indra/llui/lltexteditor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index d5e08fa29b..3dc1b99edb 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -2911,7 +2911,7 @@ void LLTextEditor::markAsPreedit(S32 position, S32 length) S32 LLTextEditor::getPreeditFontSize() const { - return llround((F32)mFont->getLineHeight() * LLUI::sGLScaleFactor.mV[VY]); + return llround((F32)mFont->getLineHeight() * LLUI::getScaleFactor().mV[VY]); } BOOL LLTextEditor::isDirty() const |