diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2009-11-20 17:12:46 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2009-11-20 17:12:46 -0800 |
| commit | 8f451be20e6ef4f9965a9f7f8dbd9145124956b3 (patch) | |
| tree | 333c9132fbbeb0bf418dff482bbef4a73158450c | |
| parent | 8ea25d130d3240f185f2b8697319c6198dd18662 (diff) | |
Change to fix DEV-43230 (Japanese input methods don't work with the web browser plugin on the Mac.)
Inside LLWindowMacOSX::allowLanguageTextInput(), tell the Text Services Manager to put up its own UI for input methods if language text input is being disallowed. This means that the non-inline UI will come up when when entering text in a browser plugin instance with an interactive text input method selected.
| -rw-r--r-- | indra/llwindow/llwindowmacosx.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 96e5a1b7ca..af9a30cb25 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -522,7 +522,6 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits if (mTSMDocument) { ActivateTSMDocument(mTSMDocument); - UseInputWindow(mTSMDocument, FALSE); allowLanguageTextInput(NULL, FALSE); } } @@ -3317,6 +3316,8 @@ void LLWindowMacOSX::allowLanguageTextInput(LLPreeditor *preeditor, BOOL b) return; } + UseInputWindow(mTSMDocument, !b); + // Take care of old and new preeditors. if (preeditor != mPreeditor || !b) { |