1 files changed, 10 insertions, 7 deletions

diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index 31fa653..59aa572 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -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"
@@ -553,15 +554,17 @@ void LLChatBar::onInputEditorGainFocus( LLFocusableElement* caller, void* userda
 // static
 void LLChatBar::onClickSay( LLUICtrl* ctrl, void* userdata )
 {
-        LLChatBar* self = (LLChatBar*) userdata;
+        e_chat_type chat_type = CHAT_TYPE_NORMAL;
         if (ctrl->getValue().asString() == "shout")
         {
-                self->sendChat( CHAT_TYPE_SHOUT );
+                chat_type = CHAT_TYPE_SHOUT;
         }
-        else
+        else if (ctrl->getValue().asString() == "whisper")
         {
-                self->sendChat( CHAT_TYPE_NORMAL );
+                chat_type = CHAT_TYPE_WHISPER;
         }
+        LLChatBar* self = (LLChatBar*) userdata;
+        self->sendChat(chat_type);
 }
 
 void LLChatBar::sendChatFromViewer(const std::string &utf8text, EChatType type, BOOL animate)
@@ -644,8 +647,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 +659,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())
                 {