From 78aec043f35b8b07dc0f2ba39baba737dd57555e Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Wed, 21 Nov 2007 02:10:12 +0000
Subject: svn merge -r 73148:74186
 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer -->
 release

---
 indra/llui/lllineeditor.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/llui/lllineeditor.cpp')

diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index 0a63ebbe74..420970a38a 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -1637,6 +1637,9 @@ void LLLineEditor::draw()
 				S32 pixels_after_scroll = findPixelNearestPos();	// RCalculcate for IME position
 				LLRect screen_pos = getScreenRect();
 				LLCoordGL ime_pos( screen_pos.mLeft + pixels_after_scroll, screen_pos.mTop - UI_LINEEDITOR_V_PAD );
+
+				ime_pos.mX = (S32) (ime_pos.mX * LLUI::sGLScaleFactor.mV[VX]);
+				ime_pos.mY = (S32) (ime_pos.mY * LLUI::sGLScaleFactor.mV[VY]);
 				getWindow()->setLanguageTextInput( ime_pos );
 			}
 		}
-- 
cgit v1.2.3