SL-12168 FIXED crash on exit, if resetting camera was performed

meow-7.2.2
Mnikolenko Productengine 2019-10-22 17:47:44 +03:00
parent cc32c70518
commit 7d7b60a9be
3 changed files with 15 additions and 0 deletions

View File

@ -282,6 +282,11 @@ LLAgentCamera::~LLAgentCamera()
//-----------------------------------------------------------------------------
void LLAgentCamera::resetView(BOOL reset_camera, BOOL change_camera)
{
if (gDisconnected)
{
return;
}
if (gAgent.getAutoPilot())
{
gAgent.stopAutoPilot(TRUE);

View File

@ -1719,6 +1719,11 @@ bool LLAppViewer::cleanup()
disconnectViewer();
LL_INFOS() << "Viewer disconnected" << LL_ENDL;
if (gKeyboard)
{
gKeyboard->resetKeys();
}
display_cleanup();

View File

@ -986,6 +986,11 @@ EKeyboardMode LLViewerKeyboard::getMode()
// Called from scanKeyboard.
void LLViewerKeyboard::scanKey(KEY key, BOOL key_down, BOOL key_up, BOOL key_level)
{
if (LLApp::isExiting())
{
return;
}
S32 mode = getMode();
// Consider keyboard scanning as NOT mouse event. JC
MASK mask = gKeyboard->currentMask(FALSE);