diff options
| author | Dave Parks <davep@lindenlab.com> | 2009-11-24 23:21:57 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2009-11-24 23:21:57 -0600 |
| commit | e264f00c833805e1f813bc1d0b2cfd7a1bf7b272 (patch) | |
| tree | 1a64a520502d2ed2c7dadc2316e543ae9e9a91d2 /indra/llwindow/llwindowmacosx.cpp | |
| parent | c9e153c182dae9472a2b87cddfec8c47b30b06b9 (diff) | |
| parent | 5b5354c933aa7b1ceeb307853c24fba28d4e31bf (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) { |