From e82dc09f756fa259be4abbfbab8d718b607a4e23 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Sat, 27 Jul 2013 15:12:43 +0200 Subject: [PATCH] FIRE-10906: Respect the "pressing letter keys: starts local chat" option while being in mouselook mode --- indra/newview/llviewerwindow.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index ef20373067..133fcbe49a 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2839,9 +2839,11 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask) // pressed except shift), then give focus to nearby chat (STORM-560) // Attempt to speed up things a little + // -- Also removed !gAgentCamera.cameraMouselook() because of FIRE-10906; Pressing letter keys SHOULD move focus to chat when this option is enabled, regardless of being in mouselook or not + // -- The need to press Enter key while being in mouselook mode every time to say a sentence is not too coherent with user's expectation, if he/she checked "starts local chat" // if ( gSavedSettings.getS32("LetterKeysFocusChatBar") && !gAgentCamera.cameraMouselook() && static LLCachedControl LetterKeysFocusChatBar(gSavedSettings, "LetterKeysFocusChatBar"); - if ( LetterKeysFocusChatBar && !gAgentCamera.cameraMouselook() && + if ( LetterKeysFocusChatBar && // !keyboard_focus && key < 0x80 && (mask == MASK_NONE || mask == MASK_SHIFT) ) {