From d4084c6fcd725d558929ae5e8fd4163c0f3bd92d Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Mon, 13 Feb 2012 17:10:55 -0600 Subject: [PATCH] Backed out changeset aa589af50d55: not needed since Ansariel's fix in 26491. --- indra/newview/llviewerwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 2c046a43a3..c96226ed34 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -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) ) { // Remove floating chat bar // LLLineEditor* chat_editor = LLFloaterReg::getTypedInstance("chat_bar")->getChatBox();