diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-11-11 16:19:35 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-11-11 16:19:35 -0500 |
| commit | 3c2b90514d1390594149f35a88f2e5d27d173d58 (patch) | |
| tree | 844fbaf5f5c285876601e098c2e109c35d542f07 /indra/llwindow/llwindowmacosx.cpp | |
| parent | b8f1e2a7704bdac5ef270be21918317a17f77b2a (diff) | |
| parent | ebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff) | |
merge 3.6.10-release
Diffstat (limited to 'indra/llwindow/llwindowmacosx.cpp')
| -rwxr-xr-x | indra/llwindow/llwindowmacosx.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index d5b62bd3a7..11c0b51086 100755 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -331,7 +331,16 @@ void callMouseExit() void callWindowFocus() { - gWindowImplementation->getCallbacks()->handleFocus(gWindowImplementation); + if ( gWindowImplementation && gWindowImplementation->getCallbacks() ) + { + gWindowImplementation->getCallbacks()->handleFocus (gWindowImplementation); + } + else + { + LL_WARNS("COCOA") << "Window Implementation or callbacks not yet initialized." << LL_ENDL; + } + + } void callWindowUnfocus() |