Merged in Armin's gesture manager patch to compensate for removing 'Gestures' from the pie.

2 files changed, 9 insertions, 6 deletions

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>