From f6e2a7bbdd8e65a27e3c397dab98807e881323a7 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 27 Apr 2009 14:08:57 -0700
Subject: Applied Armin's gesture manager patch

---
 linden/indra/newview/llchatbar.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index 31fa653..971ffcd 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -48,6 +48,7 @@
 #include "llcommandhandler.h"	// secondlife:///app/chat/ support
 #include "llviewercontrol.h"
 #include "llfloaterchat.h"
+#include "llfloatergesture.h"
 #include "llgesturemgr.h"
 #include "llkeyboard.h"
 #include "lllineeditor.h"
@@ -644,8 +645,9 @@ void LLChatBar::onCommitGesture(LLUICtrl* ctrl, void* data)
 	if (gestures)
 	{
 		S32 index = gestures->getFirstSelectedIndex();
-		if (index == 0)
+		if (index <= 0)
 		{
+			LLFloaterGesture::toggleVisibility();
 			return;
 		}
 		const std::string& trigger = gestures->getSelectedValue().asString();
@@ -655,7 +657,6 @@ void LLChatBar::onCommitGesture(LLUICtrl* ctrl, void* data)
 		std::string text(trigger);
 		std::string revised_text;
 		gGestureManager.triggerAndReviseString(text, &revised_text);
-
 		revised_text = utf8str_trim(revised_text);
 		if (!revised_text.empty())
 		{
-- 
cgit v1.1