From 031c47e77818342585f473b0ceb17b8cbe1e0fb3 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 23 Apr 2009 17:39:14 -0700
Subject: Started 1.2.0 branch

---
 ChangeLog.txt | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index ed4d4a6..f5109d2 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,17 @@
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+=-                        1.2.0                           -=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+2009-04-22  McCabe Maxsted  <hakushakukun@gmail.com>
+
+
+	Started 1.2.0 branch.
+	
+	
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+=-                       1.1.0 RC3                        -=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-	
+
 2009-04-17  McCabe Maxsted  <hakushakukun@gmail.com>
 
 	* linden/indra/llmedia/llmediaimplgstreamer.cpp:
-- 
cgit v1.1


From 05be3529c2089ffd533fbb0f32b9f5a6d7246fe8 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 24 Apr 2009 15:56:15 -0700
Subject: Fixed space in changelog

---
 ChangeLog.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index f5109d2..9c4daf3 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -4,7 +4,6 @@
 
 2009-04-22  McCabe Maxsted  <hakushakukun@gmail.com>
 
-
 	Started 1.2.0 branch.
 	
 	
-- 
cgit v1.1


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

---
 ChangeLog.txt                                                  |  8 ++++++++
 linden/indra/newview/llchatbar.cpp                             |  5 +++--
 .../indra/newview/skins/default/xui/en-us/panel_chat_bar.xml   | 10 ++++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 9c4daf3..efbdbd8 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -2,6 +2,14 @@
 =-                        1.2.0                           -=
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
+2009-04-27  Armin Weatherwax  <email@unknown.com>
+
+	* linden/indra/newview/llchatbar.cpp: 
+	Applied Armin's gesture manager patch.
+	* linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml: 
+	Ditto.
+
+
 2009-04-22  McCabe Maxsted  <hakushakukun@gmail.com>
 
 	Started 1.2.0 branch.
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())
 		{
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
index 95604ff..1d77909 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
@@ -14,7 +14,7 @@
 	     left="107" max_length="254" name="Chat Editor"
 	     select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
 	     tool_tip="Press Enter to say, Ctrl-Enter to shout." width="105" />
-	<flyout_button bottom="-23" follows="right|bottom" height="20" label="Say" left_delta="110"
+	<flyout_button bottom="-23" follows="right|bottom" height="20" label="Say" left_delta="109"
 	     list_position="above" mouse_opaque="true" name="Say" tool_tip="(Enter)"
 	     width="80">
 		<flyout_button_item value="say" name="say_item">
@@ -24,8 +24,10 @@
 			Shout
 		</flyout_button_item>
 	</flyout_button>
-	<combo_box allow_text_entry="false" bottom="-23" follows="right|bottom" height="20"
-	     label="Gestures" left_delta="85" max_chars="20" name="Gesture" width="90">
-	</combo_box>
+	<flyout_button bottom="-23" follows="right|bottom" height="20" label="Gestures" left_delta="83"
+		       list_position="above" mouse_opaque="true" name="Gesture" tool_tip="(tooltip)"
+		       width="95">
+	</flyout_button>
+	
   <string name="gesture_label">Gestures</string>
 </panel>
-- 
cgit v1.1