FIRE-10906: Respect the "pressing letter keys: starts local chat" option while being in mouselook mode

meow-7.2.2
PanteraPolnocy 2013-07-27 15:12:43 +02:00
parent e9dafd28ba
commit e82dc09f75
1 changed files with 3 additions and 1 deletions

View File

@ -2839,9 +2839,11 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
// pressed except shift), then give focus to nearby chat (STORM-560)
// <FS:PP> 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<S32> LetterKeysFocusChatBar(gSavedSettings, "LetterKeysFocusChatBar");
if ( LetterKeysFocusChatBar && !gAgentCamera.cameraMouselook() &&
if ( LetterKeysFocusChatBar &&
// </FS:PP>
!keyboard_focus && key < 0x80 && (mask == MASK_NONE || mask == MASK_SHIFT) )
{