diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-09-13 07:09:20 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-09-13 07:09:20 +0300 |
| commit | 1fd1251643fc2dcc7aa3967830961a0254b13df5 (patch) | |
| tree | 9750dca4b11d6817f40e6390f62cc09193be619c /indra/llwindow/llwindowwin32.cpp | |
| parent | 228a25256e7b1a7919d33a8289430282f5fecbb0 (diff) | |
| parent | 94eeef729e14a452aaa952f2864b0a426727ced7 (diff) | |
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/llwindow/llwindowwin32.cpp')
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index cbda906599..4ee4a5357c 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -752,8 +752,6 @@ void LLWindowWin32::close() mDragDrop->reset(); - // Make sure cursor is visible and we haven't mangled the clipping state. - setMouseClipping(FALSE); // Go back to screen mode written in the registry. if (mFullscreen) @@ -763,13 +761,13 @@ void LLWindowWin32::close() // Don't process events in our mainWindowProc any longer. SetWindowLongPtr(mWindowHandle, GWLP_USERDATA, NULL); - if (mCallbacks) - { - mCallbacks->handleFocusLost(this); - } - else + + // Make sure cursor is visible and we haven't mangled the clipping state. + showCursor(); + setMouseClipping(FALSE); + if (gKeyboard) { - showCursor(); + gKeyboard->resetKeys(); } // Clean up remaining GL state |