From b43771cad585cb9820941eb1b24b67390eaa9435 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 23 Oct 2009 17:20:45 +0000
Subject: Merging revisions 2156-2183 of
 https://svn.aws.productengine.com/secondlife/pe/stable-2 into
 P:\svn\viewer-2.0.0-3, respecting ancestry * Bugs: EXT-1590 EXT-1694 EXT-1660
 EXT-1646 EXT-1694 EXT-1316 EXT-1775 EXT-1798 EXT-1799 EXT-1117 EXT-1571
 EXT-1572 * Dev: EXT-1757 EXT-991 EXT-1758 EXT-1770 EXT-1192 EXT-1613 EXT-1611
 EXT-1256 EXT-1758 EXT-747

---
 .../skins/default/xui/en/panel_bottomtray.xml      | 114 +++++++++++++++------
 1 file changed, 84 insertions(+), 30 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_bottomtray.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 100b2d7aaa..1196d788e4 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -36,15 +36,15 @@
          width="5"/>
         <layout_panel
  		 mouse_opaque="false"        
-         auto_resize="true"
+         auto_resize="false"
          follows="left|right"
          height="28"
          layout="topleft"
          left="5"
          min_height="28"
-         width="450"
+         width="310"
          top="0"
-         min_width="305"
+         min_width="300"
          name="chat_bar"
          user_resize="false"
          filename="panel_nearby_chat_bar.xml"/>
@@ -59,22 +59,89 @@
          name="DUMMY"
          top="0"
          width="3"/>
+        <layout_panel
+         mouse_opaque="false"
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         width="100"
+         top_delta="-10"
+         min_width="100"
+         name="speak_panel"
+         user_resize="false">
+		    <chiclet_talk
+		     follows="right"
+		     height="20"
+		     speak_button.font="SansSerifMedium"
+		     speak_button.tab_stop="true"
+		     show_button.tab_stop="true"
+		     layout="topleft"
+		     left="0"
+		     name="talk"
+		     top="6"
+		     width="100" />
+         </layout_panel>                  
+		 <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         name="DUMMY"
+         top="0"
+         width="5"/>
+        <layout_panel
+         mouse_opaque="false"
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         width="90"
+         top_delta="-10"
+         min_width="90"
+         name="gesture_panel"
+         user_resize="false">
+		    <gesture_combo_box
+		      follows="right"
+		     height="20"
+		     label="Gestures"
+		     layout="topleft"
+		     name="Gesture"
+		     left="0"
+		     top="6"
+		     width="90" />
+        </layout_panel>
+		 <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         name="DUMMY"
+         top="0"
+         width="5"/>   
         <layout_panel
          mouse_opaque="false"        
          auto_resize="false"
          follows="right"
          height="28"
          layout="topleft"
-		 left="5"
          min_height="28"
+         name="movement_panel"
          width="70"
          top_delta="-10"
-         min_width="70"
-         name="movement_panel"
-         user_resize="false">
+         min_width="70">
             <button
-             follows="right"
+             follows="left|right"
              height="20"
+             use_ellipses="true"
              is_toggle="true"
              label="Move"
              layout="topleft"
@@ -101,7 +168,7 @@
         <layout_panel
          mouse_opaque="false"        
          auto_resize="false"
-         follows="right"
+         follows="left|right"
          height="28"
          layout="topleft"
          min_height="28"
@@ -110,8 +177,9 @@
          top_delta="-10"
          width="100">
             <button
-             follows="right"
+             follows="left|right"
              height="20"
+             use_ellipses="true"
              is_toggle="true"
              label="View"
              layout="topleft"
@@ -123,22 +191,6 @@
                 <button.init_callback
                  function="Button.SetDockableFloaterToggle"
                  parameter="camera" />
-            </button>
- 			<button
-             follows="right"
-             name="camera_presets_btn"
-             top="6"
-             height="20"
-             width="20"
-             left_pad="0"
-             is_toggle="true"
-             picture_style="true"
-         	 image_selected="toggle_button_selected"
-             image_unselected="toggle_button_off">
-             <button.init_callback
-             	function="Button.SetDockableFloaterToggle"
-             	parameter="camera_presets"
-             	/>
             </button>
         </layout_panel>
         <layout_panel
@@ -183,8 +235,10 @@
          min_height="28"
          top="0"
          name="chiclet_list_panel"
-         width="150"
-         user_resize="false">
+         width="189"
+         min_width="189"
+         user_resize="false"
+         auto_resize="true">
             <chiclet_panel
 	         mouse_opaque="false"
              follows="left|right"
@@ -195,7 +249,7 @@
              top="1"
              chiclet_padding="3"
              scrolling_offset="40"
-             width="150" />
+             width="189" />
         </layout_panel>
         <icon
          auto_resize="false"
@@ -282,4 +336,4 @@
          top="0"
          width="5"/>
     </layout_stack>
-</panel>
+</panel>
\ No newline at end of file
-- 
cgit v1.2.3