diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2019-10-24 18:47:47 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2019-10-24 18:47:47 +0300 |
| commit | 39dc22d1adddb85a8b5edd5a30ad7750e9f19142 (patch) | |
| tree | 085f9be1352b3cb0bf482ed17aae496f247e2fa7 /indra/newview | |
| parent | 43809e1c5cddb4c434f6efcfd16b44ac72e6e707 (diff) | |
SL-12185 [mac] crash when typing letters while viewer is loading
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index f3de5f03cd..1e2b2c37d0 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2884,7 +2884,8 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask) // If "Pressing letter keys starts local chat" option is selected, we are not in mouselook, // no view has keyboard focus, this is a printable character key (and no modifier key is // pressed except shift), then give focus to nearby chat (STORM-560) - if ( gSavedSettings.getS32("LetterKeysFocusChatBar") && !gAgentCamera.cameraMouselook() && + if ( LLStartUp::getStartupState() >= STATE_STARTED && + gSavedSettings.getS32("LetterKeysFocusChatBar") && !gAgentCamera.cameraMouselook() && !keyboard_focus && key < 0x80 && (mask == MASK_NONE || mask == MASK_SHIFT) ) { // Initialize nearby chat if it's missing |