Second Life viewer sources 1.18.5.0-RC

1 files changed, 8 insertions, 0 deletions

diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index 9671065..78fe29c 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -1642,6 +1642,9 @@ void LLLineEditor::draw()
                                 {
                                         mLastIMEPosition.mX = ime_pos.mX;
                                         mLastIMEPosition.mY = ime_pos.mY;
+
+                                        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 );
                                 }
                         }
@@ -2219,6 +2222,11 @@ LLView* LLLineEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
         {
                 line_editor->setHandleEditKeysDirectly(handle_edit_keys_directly);
         }
+        BOOL commit_on_focus_lost = TRUE;
+        if (node->getAttributeBOOL("commit_on_focus_lost", commit_on_focus_lost))
+        {
+                line_editor->setCommitOnFocusLost(commit_on_focus_lost);
+        }
         
         line_editor->setColorParameters(node);