Backed out changeset aa589af50d55: not needed since Ansariel's fix in 26491.

meow-7.2.2
Tonya Souther 2012-02-13 17:10:55 -06:00
parent 08685b2bc8
commit d4084c6fcd
1 changed files with 2 additions and 2 deletions

View File

@ -2603,9 +2603,9 @@ 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)
// FIRE-5002: Accept the '/' key, as well, 0x98, to give focus to nearby chat. -- TS
if ( gSavedSettings.getS32("LetterKeysFocusChatBar") && !gAgentCamera.cameraMouselook() &&
!keyboard_focus && ((key < 0x80) || (key == 0x98)) && (mask == MASK_NONE || mask == MASK_SHIFT) )
!keyboard_focus && key < 0x80 && (mask == MASK_NONE || mask == MASK_SHIFT) )
{
// <FS:Zi> Remove floating chat bar
// LLLineEditor* chat_editor = LLFloaterReg::getTypedInstance<LLNearbyChatBar>("chat_bar")->getChatBox();