summaryrefslogtreecommitdiff
path: root/indra/llui/lltexteditor.cpp
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2013-03-13 13:36:45 -0400
committerprep <prep@lindenlab.com>2013-03-13 13:36:45 -0400
commit71f2032caa090efbcd0c4ad1715848ef85ebb304 (patch)
tree6c11948416c0a370ebd1983f723b2a055fc0e6a5 /indra/llui/lltexteditor.cpp
parent45838b8b07a61af9b85ab9bc3013f1ac867e70d8 (diff)
Ported sunshine-internal fixes (Commits: 5271cc5 and b37c09)
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
-rw-r--r--indra/llui/lltexteditor.cpp2
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