diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-02 14:48:45 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-02 14:48:45 -0500 |
| commit | 6cffbfba8b7dd1f6752fb2b4a93265906e9aeb9c (patch) | |
| tree | 3e4fc80698d063e8fa6d1ee9a652970e04014ecd /indra/llwindow/llwindowmacosx.cpp | |
| parent | 04d9c91a5f27b554e733b77272c8c3afea458810 (diff) | |
| parent | 4f076daeff1bb626bb90a57cbe91660349ec62f1 (diff) | |
merge
Diffstat (limited to 'indra/llwindow/llwindowmacosx.cpp')
| -rwxr-xr-x | indra/llwindow/llwindowmacosx.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 9ed298a481..1f577b117e 100755 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -230,7 +230,10 @@ void callFocus() void callFocusLost() { - gWindowImplementation->getCallbacks()->handleFocusLost(gWindowImplementation); + if (gWindowImplementation) + { + gWindowImplementation->getCallbacks()->handleFocusLost(gWindowImplementation); + } } void callRightMouseDown(float *pos, MASK mask) @@ -1826,8 +1829,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 @@ -1857,6 +1858,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() |