diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-10-23 16:07:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-10-23 16:07:31 -0400 |
| commit | a837281a77c70c9a28c3edc0ed0603a7d7ade511 (patch) | |
| tree | 48100815dc414f7c73f77fb8b031e23df6b13253 /indra | |
| parent | 075c53cf3152f6411fd3f6ade941754a10cd0eaa (diff) | |
| parent | 47854b621884a2504ae34ce72eabf57a7a946bfd (diff) | |
merge changes for STORM-2081
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llwindow/llwindowmacosx.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 75900c3cb4..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) |