diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-12-05 17:12:42 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-12-05 17:12:42 -0500 |
| commit | bf2e3fca73b80afa10a1c913ba752fcaf79ccd19 (patch) | |
| tree | 12a8ae6dd43c065b6ebc91f4b3ad1e29eade4c7f /indra/llwindow/llwindowmacosx.cpp | |
| parent | 44f5d7320952de2c4c7e1062b1c02c2f521400fa (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 18d5152015..aca8bb6527 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) @@ -1805,8 +1808,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 +1837,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() |