diff options
| author | Pell Smit <pellsmit@gmail.com> | 2014-08-15 03:52:22 +0900 |
|---|---|---|
| committer | Pell Smit <pellsmit@gmail.com> | 2014-08-15 03:52:22 +0900 |
| commit | ebd94bf07a02beee8fbf84ec172bcbf1ac3d475f (patch) | |
| tree | 682496d7a8ad4aaa97d27a4c714ea87802bf475c /indra/llwindow/llwindowmacosx.cpp | |
| parent | bef17f2af78c9f351ecbe80740ae71a61985d06e (diff) | |
fixed: unwanted input window on OSX
Diffstat (limited to 'indra/llwindow/llwindowmacosx.cpp')
| -rwxr-xr-x | indra/llwindow/llwindowmacosx.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 18d5152015..75900c3cb4 100755 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -1805,8 +1805,6 @@ static long getDictLong (CFDictionaryRef refDict, CFStringRef key) void LLWindowMacOSX::allowLanguageTextInput(LLPreeditor *preeditor, BOOL b) { - allowDirectMarkedTextInput(b, mGLView); - if (preeditor != mPreeditor && !b) { // This condition may occur by a call to @@ -1836,6 +1834,7 @@ void LLWindowMacOSX::allowLanguageTextInput(LLPreeditor *preeditor, BOOL b) return; } mLanguageTextInputAllowed = b; + allowDirectMarkedTextInput(b, mGLView); // mLanguageTextInputAllowed and mMarkedTextAllowed should be updated at once (by Pell Smit } void LLWindowMacOSX::interruptLanguageTextInput() |