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/llchatbar.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp
index 1798aea122..2ea9bf6e5e 100644
--- a/indra/newview/llchatbar.cpp
+++ b/indra/newview/llchatbar.cpp
@@ -125,6 +125,12 @@ BOOL LLChatBar::postBuild()
 	// attempt to bind to an existing combo box named gesture
 	setGestureCombo(LLUICtrlFactory::getComboBoxByName(this, "Gesture"));
 
+	LLButton * sayp = getChild<LLButton>("Say");
+	if(sayp)
+	{
+		setDefaultBtn(sayp);
+	}
+
 	mInputEditor = LLUICtrlFactory::getLineEditorByName(this, "Chat Editor");
 	if (mInputEditor)
 	{
-- 
cgit v1.2.3