diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-23 15:53:19 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-23 15:53:19 +0200 |
| commit | 25085a67f4baf341f1ebc26d7ba21e294ec56302 (patch) | |
| tree | 296235a869f73af24b274dd42cc07fcf31d1ce19 /indra/llwindow | |
| parent | 9f0dbcf4c0c6c8621c377fd7f9e417aa76acd836 (diff) | |
| parent | d2cee29e8a039e3cac5c851b4e770b9c7e1095f0 (diff) | |
Merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/llwindow')
| -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) { |