diff options
Diffstat (limited to 'linden/indra/llui/lltexteditor.cpp')
-rw-r--r-- | linden/indra/llui/lltexteditor.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp index 200cf29..d08997c 100644 --- a/linden/indra/llui/lltexteditor.cpp +++ b/linden/indra/llui/lltexteditor.cpp | |||
@@ -310,8 +310,7 @@ LLTextEditor::LLTextEditor( | |||
310 | mMouseDownX(0), | 310 | mMouseDownX(0), |
311 | mMouseDownY(0), | 311 | mMouseDownY(0), |
312 | mLastSelectionX(-1), | 312 | mLastSelectionX(-1), |
313 | mLastSelectionY(-1), | 313 | mLastSelectionY(-1) |
314 | mLastIMEPosition(-1,-1) | ||
315 | { | 314 | { |
316 | mSourceID.generate(); | 315 | mSourceID.generate(); |
317 | 316 | ||
@@ -2817,15 +2816,10 @@ void LLTextEditor::drawCursor() | |||
2817 | // Make sure the IME is in the right place | 2816 | // Make sure the IME is in the right place |
2818 | LLRect screen_pos = getScreenRect(); | 2817 | LLRect screen_pos = getScreenRect(); |
2819 | LLCoordGL ime_pos( screen_pos.mLeft + llfloor(cursor_left), screen_pos.mBottom + llfloor(cursor_top) ); | 2818 | LLCoordGL ime_pos( screen_pos.mLeft + llfloor(cursor_left), screen_pos.mBottom + llfloor(cursor_top) ); |
2820 | if ( ime_pos.mX != mLastIMEPosition.mX || ime_pos.mY != mLastIMEPosition.mY ) | ||
2821 | { | ||
2822 | mLastIMEPosition.mX = ime_pos.mX; | ||
2823 | mLastIMEPosition.mY = ime_pos.mY; | ||
2824 | 2819 | ||
2825 | ime_pos.mX = (S32) (ime_pos.mX * LLUI::sGLScaleFactor.mV[VX]); | 2820 | ime_pos.mX = (S32) (ime_pos.mX * LLUI::sGLScaleFactor.mV[VX]); |
2826 | ime_pos.mY = (S32) (ime_pos.mY * LLUI::sGLScaleFactor.mV[VY]); | 2821 | ime_pos.mY = (S32) (ime_pos.mY * LLUI::sGLScaleFactor.mV[VY]); |
2827 | getWindow()->setLanguageTextInput( ime_pos ); | 2822 | getWindow()->setLanguageTextInput( ime_pos ); |
2828 | } | ||
2829 | } | 2823 | } |
2830 | } | 2824 | } |
2831 | } | 2825 | } |