From 2e32d44e7165775936beae5d9ef636ff9d3f2bd2 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Tue, 19 Feb 2008 21:42:32 +0000
Subject: merge
 svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986
 : 80178 -> release.

QAR-290 = QAR-271 + QAR-191
---
 indra/newview/llviewerkeyboard.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'indra/newview/llviewerkeyboard.cpp')

diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp
index b5d30df2f4..a8f88ec036 100644
--- a/indra/newview/llviewerkeyboard.cpp
+++ b/indra/newview/llviewerkeyboard.cpp
@@ -473,11 +473,8 @@ void stop_moving( EKeystate s )
 
 void start_chat( EKeystate s )
 {
-	if (!gChatBar->inputEditorHasFocus())
-	{
-		// start chat
-		gChatBar->startChat(NULL);
-	}
+	// start chat
+	gChatBar->startChat(NULL);
 }
 
 void bind_keyboard_functions()
-- 
cgit v1.2.3