diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-04-25 21:00:16 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-25 21:00:16 -0700 |
| commit | fd447189c5e05df53cd8ec0a4168370c03c3bb16 (patch) | |
| tree | 484b5075ff9c977dd29679c87f6eaa08144b292f /indra/llui/lltexteditor.cpp | |
| parent | b1d608ee99824fde13f3f16e0947ec5b54299fca (diff) | |
| parent | 2dc4f8f8e98da565c158ec9947fe96eccd4920e9 (diff) | |
Merge 3.5.1 into Materials
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
| -rwxr-xr-x[-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 b8bdea48b5..834f213097 100644..100755 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -2917,7 +2917,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 |