From dbf88458340f192e6dec7fd35098c544da50dc80 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Thu, 27 Jun 2013 20:21:32 -0500
Subject: [PATCH] Fixup active speakers floater

---
 .../xui/en-us/floater_active_speakers.xml     | 41 ++++++++-----------
 .../xui/es/floater_active_speakers.xml        | 16 ++++----
 .../xui/fr/floater_active_speakers.xml        | 16 ++++----
 .../xui/pt/floater_active_speakers.xml        | 16 ++++----
 4 files changed, 42 insertions(+), 47 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml b/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
index a808fc5f8..845574902 100644
--- a/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
@@ -3,27 +3,22 @@
      height="300" min_height="200" min_width="180" name="active_speakers"
      rect_control="FloaterActiveSpeakersRect" title="Active Speakers"
      width="250">
-	<panel bottom="0" follows="left|top|right|bottom" left="0" mouse_opaque="false"
-	     name="active_speakers_panel" right="250" top="300">
-		<scroll_list bottom="35" can_resize="true" column_padding="0" draw_heading="true"
-		     draw_stripes="false" follows="left|top|bottom|right" left="10"
-		     multi_select="false" name="speakers_list" right="-10" search_column="1"
-		     sort_column="2" top="-20">
-			<column name="icon_speaking_status" sort="speaking_status" width="20" />
-			<column dynamicwidth="true" label="Name" name="speaker_name" />
-			<column label="" name="speaking_status" width="0" />
-		</scroll_list>
-		<panel background_opaque="false" background_visible="false" bevel_style="in"
-		     bg_alpha_color="0,0,0,0" bg_opaque_color="0,0,0,0.3" border="false"
-		     bottom="5" can_resize="false" follows="left|right|bottom" height="20"
-		     left="10" mouse_opaque="true" name="volume_container" right="-10">
-			<volume_slider bottom="5" follows="left|bottom" height="15" increment="0.05" initial_val="0.5"
-			     left_delta="10" max_val="1.0" min_val="0.0" name="speaker_volume"
-			     width="110" />
-			<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga"
-			     image_unselected="icn_speaker_dark.tga" label="" left_delta="115"
-			     name="mute_btn" toggle="true" tool_tip="Mute voice for this resident"
-			     width="25" scale_image="false" />
-		</panel>
-	</panel>
+  <layout_stack bottom="0" follows="all" mouse_opaque="false" left="5" right="-4" top="280" name="active_speakers_stack">
+    <layout_panel mouse_opaque="false" auto_resize="true" user_resize="false" name="active_speakers_panel" height="280">
+      <scroll_list bottom="25" top="280" left="0" right="-1"
+		       draw_stripes="false" follows="all" can_resize="true" column_padding="0" draw_heading="true"
+		       multi_select="false" name="speakers_list" search_column="1" sort_column="2">
+        <column name="icon_speaking_status" sort="speaking_status" width="20" />
+        <column dynamicwidth="true" label="Name" name="speaker_name" />
+        <column label="" name="speaking_status" width="0" />
+      </scroll_list>
+      <volume_slider bottom="5" follows="left|bottom" height="15" increment="0.05" initial_val="0.5"
+       left="0" max_val="1.0" min_val="0.0" name="speaker_volume"
+       width="145" />
+      <button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga"
+			       image_unselected="icn_speaker_dark.tga" label="" left_delta="145"
+			       name="mute_btn" toggle="true" tool_tip="Mute voice for this resident"
+			       width="25" scale_image="false" />
+    </layout_panel>
+  </layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_active_speakers.xml b/indra/newview/skins/default/xui/es/floater_active_speakers.xml
index 486f296f7..efa2e76fe 100644
--- a/indra/newview/skins/default/xui/es/floater_active_speakers.xml
+++ b/indra/newview/skins/default/xui/es/floater_active_speakers.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="active_speakers" title="Participantes Activos">
-	<panel name="active_speakers_panel">
-		<scroll_list name="speakers_list">
-			<column label="Nombre" name="speaker_name"/>
-		</scroll_list>
-		<panel name="volume_container">
-			<button name="mute_btn" tool_tip="Ignorar la voz de este residente"/>
-		</panel>
-	</panel>
+  <layout_stack name="active_speakers_stack">
+    <layout_panel name="active_speakers_panel">
+      <scroll_list name="speakers_list">
+        <column label="Nombre" name="speaker_name"/>
+      </scroll_list>
+      <button name="mute_btn" tool_tip="Ignorar la voz de este residente"/>
+    </layout_panel>
+  </layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_active_speakers.xml b/indra/newview/skins/default/xui/fr/floater_active_speakers.xml
index ea277bfc8..e95f8e72a 100644
--- a/indra/newview/skins/default/xui/fr/floater_active_speakers.xml
+++ b/indra/newview/skins/default/xui/fr/floater_active_speakers.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="active_speakers" title="Intervenants actifs">
-	<panel name="active_speakers_panel">
-		<scroll_list name="speakers_list">
-			<column label="Nom" name="speaker_name"/>
-		</scroll_list>
-		<panel name="volume_container">
-			<button name="mute_btn" tool_tip="Ignorer ce résident"/>
-		</panel>
-	</panel>
+  <layout_stack name="active_speakers_stack">
+    <layout_panel name="active_speakers_panel">
+      <scroll_list name="speakers_list">
+        <column label="Nom" name="speaker_name"/>
+      </scroll_list>
+      <button name="mute_btn" tool_tip="Ignorer ce résident"/>
+    </layout_panel>
+  </layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_active_speakers.xml b/indra/newview/skins/default/xui/pt/floater_active_speakers.xml
index 728320bbb..64197fc24 100644
--- a/indra/newview/skins/default/xui/pt/floater_active_speakers.xml
+++ b/indra/newview/skins/default/xui/pt/floater_active_speakers.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="active_speakers" title="Falantes Ativos">
-	<panel name="active_speakers_panel">
-		<scroll_list name="speakers_list">
-			<column label="Nome" name="speaker_name"/>
-		</scroll_list>
-		<panel name="volume_container">
-			<button label="" name="mute_btn" tool_tip="Emudecer a voz para este residente"/>
-		</panel>
-	</panel>
+  <layout_stack name="active_speakers_stack">
+    <layout_panel name="active_speakers_panel">
+      <scroll_list name="speakers_list">
+        <column label="Nome" name="speaker_name"/>
+      </scroll_list>
+      <button label="" name="mute_btn" tool_tip="Emudecer a voz para este residente"/>
+    </layout_panel>
+  </layout_stack>
 </floater>