diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-12-12 09:59:50 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-12-12 09:59:50 -0800 |
| commit | 4745ab85dab9e418c49e5c4a722aa88548b8f39e (patch) | |
| tree | 367001447fda9438c5beb03f2fb09bbe7e2b2abd /indra/llwindow/llwindowmacosx.cpp | |
| parent | 6a89cb6f25adafdf07a4241e7bbe6fee758c1048 (diff) | |
| parent | a4f121f065c580ac34e8caa666855c95eb29138b (diff) | |
Pull merge from lindenlab/viewer-acme
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() |