diff options
author | Erik Kundiman <erik@megapahit.org> | 2024-10-22 13:21:50 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2024-10-22 16:49:53 +0800 |
commit | 705230a26ed4c33af2d3af07c160386ded740079 (patch) | |
tree | d812e7e68b43c5a9681482aa598a6346dd7193c8 /indra/newview | |
parent | 9d38264521ef5aed9382e46c5b9ba82d0e681c79 (diff) |
Revert "IME composition is now replaced by the result"
This reverts commit 60592ae0d7a98e071e516fcac70c5bf1427f20be.
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llviewerwindow.cpp | 4 | ||||
-rw-r--r-- | indra/newview/llviewerwindow.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index c8ff744369..0e2e57a84a 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -3147,11 +3147,11 @@ bool LLViewerWindow::handleUnicodeChar(llwchar uni_char, MASK mask) return false; } -bool LLViewerWindow::handleUnicodeString(char *uni_str, bool editing) +bool LLViewerWindow::handleUnicodeString(char *uni_str) { auto keyboard_focus = gFocusMgr.getKeyboardFocus(); if (keyboard_focus) - keyboard_focus->handleUnicodeString(uni_str, editing, FALSE); + keyboard_focus->handleUnicodeString(uni_str, FALSE); return TRUE; } diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h index acf9485eca..31bf5b5332 100644 --- a/indra/newview/llviewerwindow.h +++ b/indra/newview/llviewerwindow.h @@ -194,7 +194,7 @@ public: /*virtual*/ bool handleTranslatedKeyUp(KEY key, MASK mask); /*virtual*/ void handleScanKey(KEY key, bool key_down, bool key_up, bool key_level); /*virtual*/ bool handleUnicodeChar(llwchar uni_char, MASK mask); // NOT going to handle extended - /*virtual*/ bool handleUnicodeString(char *uni_str, bool editing); + /*virtual*/ bool handleUnicodeString(char *uni_str); /*virtual*/ bool handleMouseDown(LLWindow *window, LLCoordGL pos, MASK mask); /*virtual*/ bool handleMouseUp(LLWindow *window, LLCoordGL pos, MASK mask); /*virtual*/ bool handleCloseRequest(LLWindow *window); |