livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shot in the dark patch for MAINT-3353 backported from viewer-tiger

master
Aura Linden 2013-11-05 13:01:25 -08:00
parent 71205580d9
commit 976ad95977
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llwindow/llwindowcallbacks.cpp
View File

@ -122,6 +122,7 @@ void LLWindowCallbacks::handleResize(LLWindow *window, const S32 width, const S3
void LLWindowCallbacks::handleFocus(LLWindow *window)
{
LL_WARNS("COCOA") << "Called handleFocus proto" << LL_ENDL;
}
void LLWindowCallbacks::handleFocusLost(LLWindow *window)

11
indra/llwindow/llwindowmacosx.cpp
View File

@ -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()