From c2fbb6f10fdf4f3a2d6423ce4a22e13613d31387 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sun, 14 Jul 2019 02:12:03 -0400
Subject: [PATCH] Fix single line group chat button positions

---
 .../floater_instant_message_group_concisebuttons.xml  |  8 +++-----
 .../floater_instant_message_group_concisebuttons.xml  |  7 ++++---
 .../floater_instant_message_group_concisebuttons.xml  | 11 ++++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/indra/newview/skins/default/xui/de/floater_instant_message_group_concisebuttons.xml b/indra/newview/skins/default/xui/de/floater_instant_message_group_concisebuttons.xml
index d173c660c..c7930eef3 100644
--- a/indra/newview/skins/default/xui/de/floater_instant_message_group_concisebuttons.xml
+++ b/indra/newview/skins/default/xui/de/floater_instant_message_group_concisebuttons.xml
@@ -10,18 +10,16 @@
 	<string name="default_text_label">Für Instant Message hier klicken.</string>
 	<string name="moderated_chat_label">(Moderiert: Stimmen in der Standardeinstellung stummgeschaltet)</string>
 	<string name="muted_text_label">Ihr Text-Chat wurde von einem Gruppenmoderator deaktiviert.</string>
-	<button label="Gruppeninfo" name="group_info_btn"/>
-	<button label="Verlauf" name="history_btn"/>
+	<flyout_button label="Gruppeninfo" name="instant_message_flyout">
+		<flyout_button_item label="Verlauf" name="history_btn"/>
+	</flyout_button>
 	<button label="Gespräch beitreten" name="start_call_btn"/>
 	<button label="Anruf beenden" name="end_call_btn"/>
 	<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Klicken Sie hier um eine Liste der aktiven Teilnehmer dieser IM-Sitzung anzuzeigen."/>
 	<layout_stack name="panels">
 		<layout_panel name="im_contents_panel">
-			
-			
 			<button label="Senden" name="send_btn"/>
 		</layout_panel>
-		
 	</layout_stack>
 	<string name="live_help_dialog">*** Willkommen bei Help Request ***  
 Bitte werfen Sie zuerst einen Blick auf unsere SL-Hilfeseiten. Drücken Sie dazu F1. Oder rufen Sie unter http://secondlife.com/knowledgebase/ die Knowledge Base auf. 
diff --git a/indra/newview/skins/default/xui/en-us/floater_instant_message_group_concisebuttons.xml b/indra/newview/skins/default/xui/en-us/floater_instant_message_group_concisebuttons.xml
index dbc63788f..f7b2b2ab5 100644
--- a/indra/newview/skins/default/xui/en-us/floater_instant_message_group_concisebuttons.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_instant_message_group_concisebuttons.xml
@@ -10,9 +10,10 @@
 	<string name="default_text_label">Click here to instant message.</string>
 	<string name="moderated_chat_label">(Moderated: Voices off by default)</string>
 	<string name="muted_text_label">Your text chat has been disabled by a Group Moderator.</string>
-    <button bottom="-20" follows="right|top" height="20" label="Group Info" right="-290" name="group_info_btn" tab_group="0" width="80"/>
-	<button bottom_delta="0" follows="right|top" height="20" label="History" left_delta="80" name="history_btn" width="80"/>
-    <button bottom_delta="0" follows="right|top" height="20" left_delta="80" width="50" toggle="true" name="ding_btn" label="Ding">
+    <flyout_button bottom="-20" follows="right|top" halign="center" height="20" label="Group Info" right="-260" name="instant_message_flyout" width="100" list_position="below">
+      <flyout_button_item label="History" name="history_btn" value="1"/>
+    </flyout_button>
+    <button bottom_delta="0" follows="right|top" height="20" left_delta="100" width="50" toggle="true" name="ding_btn" label="Ding">
       <button.commit_callback function="FlipDing"/>
     </button>
     <check_box name="Support Check" label="#" tool_tip="Uncheck to stop sending build number" follows="right|top" bottom_delta="0" left_delta="50" visible="false" initial_value="true"/>
diff --git a/indra/newview/skins/default/xui/es/floater_instant_message_group_concisebuttons.xml b/indra/newview/skins/default/xui/es/floater_instant_message_group_concisebuttons.xml
index 77cc11e63..6fe5e35d9 100644
--- a/indra/newview/skins/default/xui/es/floater_instant_message_group_concisebuttons.xml
+++ b/indra/newview/skins/default/xui/es/floater_instant_message_group_concisebuttons.xml
@@ -27,11 +27,12 @@
 	<string name="muted_text_label">
 		Tu chat de texto ha sido deshabilitado por un Moderado del Grupo.
 	</string>
-	<button label="Info Grupo" name="group_info_btn" width="80"/>
-	<button label="Historial" left_delta="85" name="history_btn" width="70"/>
-	<button name="ding_btn" left_delta="75" label="Timbre" width="55"/>
-	<check_box name="Support Check" label="#" tool_tip="Desmárcarlo para no enviar el número de versión (Build)" />
-	<button label="Unirse Voz" left_delta="60" name="start_call_btn" width="75"/>
+	<flyout_button label="Info Grupo" name="instant_message_flyout">
+		<flyout_button_item label="Historial" name="history_btn"/>
+	</flyout_button>
+	<button name="ding_btn" label="Timbre" width="55"/>
+	<check_box name="Support Check" label="#" tool_tip="Desmárcarlo para no enviar el número de versión (Build)" left_delta="60"/>
+	<button label="Unirse Voz" name="start_call_btn" width="75"/>
 	<button label="Terminar Llamada" name="end_call_btn" width="80"/>
 	<button label="&lt; &lt;" label_selected="&gt; &gt;" left="435" name="toggle_active_speakers_btn" right="465" tool_tip="Pulsa aquí para mostrar/ocultar la lista de participantes activos en esta sesión de MI." width="20"/>
 	<layout_stack name="panels">