diff options
| author | Ramzi Linden <ramzi@lindenlab.com> | 2009-11-23 16:11:35 -0800 |
|---|---|---|
| committer | Ramzi Linden <ramzi@lindenlab.com> | 2009-11-23 16:11:35 -0800 |
| commit | f39d4e98a73d5e13ce06f6188bf2d60d2db5d085 (patch) | |
| tree | b39781e1fcbcc57139b395934594158102773c3b /indra/llwindow/llwindowmacosx.cpp | |
| parent | 58eab5547fcd5f665c5254f31afd778797e5c84c (diff) | |
| parent | c9a1d3040e4ec8fde7bc1d69ea0509f0f7d288a1 (diff) | |
merge
Diffstat (limited to 'indra/llwindow/llwindowmacosx.cpp')
| -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) { |