diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-11-11 14:00:58 -0800 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-11-11 14:00:58 -0800 |
| commit | c6aa86750c22c20dca6895695386e2357b953bbd (patch) | |
| tree | f17a25270ee814fdc5e7f1dce7eb7f10b0690c27 /indra/llwindow/llwindowmacosx.cpp | |
| parent | 1319a6258a1ec110150624ce10d951439158ee90 (diff) | |
| parent | ebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff) | |
Merge with 3.6.10
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() |