diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-12-15 12:34:18 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-12-15 12:34:18 -0500 |
| commit | dab5acd972c05b4c9d23d5dfb46afe9eff6c9567 (patch) | |
| tree | 6f3b1ca79eefbc2b232a5da809359eefcf59ecfb /indra/llwindow/llwindowmacosx.cpp | |
| parent | eb5c0dd32a7f4e4a603fe88cfa5f18c30725d11a (diff) | |
| parent | 6d48db868f7459fcf5f0e89d830a844e409d4163 (diff) | |
merge changes for 3.7.22-release
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 09b898657c..e50999dc36 100755 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -224,7 +224,10 @@ void callFocus() void callFocusLost() { - gWindowImplementation->getCallbacks()->handleFocusLost(gWindowImplementation); + if (gWindowImplementation) + { + gWindowImplementation->getCallbacks()->handleFocusLost(gWindowImplementation); + } } void callRightMouseDown(float *pos, MASK mask) @@ -1799,8 +1802,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 @@ -1830,6 +1831,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() |