diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-12-12 09:03:21 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-12-12 09:03:21 -0800 |
| commit | a4f121f065c580ac34e8caa666855c95eb29138b (patch) | |
| tree | 2e9d9766c99cb7bd81aa4ad7e4af1149cfa03de6 /indra/llwindow/llwindowmacosx.cpp | |
| parent | 88f139594bb819bc31b438edcceaf9cd661b3f82 (diff) | |
| parent | 1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff) | |
Pull merge from lindenlab/viewer-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() |