diff options
| author | Don Kjer <don@lindenlab.com> | 2007-11-09 01:56:15 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-11-09 01:56:15 +0000 |
| commit | c1920e3c1c60fb792cf091750b05de618b355878 (patch) | |
| tree | 204b78e0f0b87fb2875b90af0f579d53e3138cbb /indra/llui/lltexteditor.cpp | |
| parent | 760f2ceb1518d87e865f25ac87a540625e974517 (diff) | |
EFFECTIVE MERGE: svn merge -r 70833:71458 svn+ssh://svn/svn/linden/branches/maintenance-2 into release
ACTUAL MERGE: svn merge -r 73210:73222 svn+ssh://svn/svn/linden/qa/maintenance-2-merge-73206 into release
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
| -rw-r--r-- | indra/llui/lltexteditor.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index 0184878e45..af1813a429 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -310,8 +310,7 @@ LLTextEditor::LLTextEditor( mMouseDownX(0), mMouseDownY(0), mLastSelectionX(-1), - mLastSelectionY(-1), - mLastIMEPosition(-1,-1) + mLastSelectionY(-1) { mSourceID.generate(); @@ -2817,12 +2816,7 @@ void LLTextEditor::drawCursor() // Make sure the IME is in the right place LLRect screen_pos = getScreenRect(); LLCoordGL ime_pos( screen_pos.mLeft + llfloor(cursor_left), screen_pos.mBottom + llfloor(cursor_top) ); - if ( ime_pos.mX != mLastIMEPosition.mX || ime_pos.mY != mLastIMEPosition.mY ) - { - mLastIMEPosition.mX = ime_pos.mX; - mLastIMEPosition.mY = ime_pos.mY; - getWindow()->setLanguageTextInput( ime_pos ); - } + getWindow()->setLanguageTextInput( ime_pos ); } } } |