diff options
| author | simon <none@none> | 2013-11-12 11:31:33 -0800 |
|---|---|---|
| committer | simon <none@none> | 2013-11-12 11:31:33 -0800 |
| commit | ecf211a5dcebad85e52255121e749df9e2d9df28 (patch) | |
| tree | 8f93bdc06b1cc42f1681175a55b2430b0d05993e /indra/llwindow/llwindowmacosx.cpp | |
| parent | 241259820c0461e90ad71a78fcd751a16892a5a6 (diff) | |
| parent | a7381f6e40388900dd956a54167a33266e82238c (diff) | |
Merge downstream code from viewer-bear
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() |