EXT-1922 XUI Army Bottom tray layout & style changes

4 files changed, 118 insertions, 154 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 1196d788e4..9065c6b3e8 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -2,21 +2,21 @@
 <panel
  mouse_opaque="true"
  background_visible="true"
- bg_alpha_color="0.25 0.25 0.25 1"
- bg_opaque_color="0.25 0.25 0.25 1"
+ bg_alpha_color="DkGray"
+ bg_opaque_color="DkGray"
  follows="left|bottom|right"
- height="28"
+ height="33"
  layout="topleft"
  left="0"
  name="bottom_tray"
  top="28"
- border_visible="true"
+ border_visible="false"
  width="1000">
     <layout_stack
-     mouse_opaque="false"    
+     mouse_opaque="false"
      border_size="0"
-     clip="false" 
-     follows="left|right|bottom|top"
+     clip="false"
+     follows="all"
      height="28"
      layout="topleft"
      left="0"
@@ -26,39 +26,27 @@
      width="1000">
         <icon
          auto_resize="false"
-         color="0 0 0 0"
          follows="left|right"
          height="10"
          image_name="spacer24.tga"
          layout="topleft"
          left="0"
          top="0"
-         width="5"/>
+         width="4" />
         <layout_panel
- 		 mouse_opaque="false"        
+ 	mouse_opaque="false"
          auto_resize="false"
          follows="left|right"
          height="28"
          layout="topleft"
-         left="5"
-         min_height="28"
+         left="0"
+         min_height="23"
          width="310"
          top="0"
          min_width="300"
          name="chat_bar"
          user_resize="false"
          filename="panel_nearby_chat_bar.xml"/>
-		 <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="3"/>
         <layout_panel
          mouse_opaque="false"
          auto_resize="false"
@@ -66,26 +54,25 @@
          height="28"
          layout="topleft"
          min_height="28"
-         width="100"
-         top_delta="-10"
-         min_width="100"
+         width="96"
+         top_delta="0"
+         min_width="96"
          name="speak_panel"
          user_resize="false">
 		    <chiclet_talk
 		     follows="right"
-		     height="20"
+		     height="23"
 		     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>                  
+		     top="3"
+		     width="96" />
+         </layout_panel>
 		 <icon
          auto_resize="false"
-         color="0 0 0 0"
          follows="left|right"
          height="10"
          image_name="spacer24.tga"
@@ -93,7 +80,7 @@
          left="0"
          name="DUMMY"
          top="0"
-         width="5"/>
+         width="4"/>
         <layout_panel
          mouse_opaque="false"
          auto_resize="false"
@@ -101,20 +88,21 @@
          height="28"
          layout="topleft"
          min_height="28"
-         width="90"
-         top_delta="-10"
-         min_width="90"
+         width="76"
+         top_delta="0"
+         min_width="76"
          name="gesture_panel"
          user_resize="false">
-		    <gesture_combo_box
+		    <button
 		      follows="right"
-		     height="20"
-		     label="Gestures"
+		     height="23"
+		     label="Gesture"
 		     layout="topleft"
 		     name="Gesture"
 		     left="0"
-		     top="6"
-		     width="90" />
+		     top="3"
+             use_ellipses="true"
+		     width="76" />
         </layout_panel>
 		 <icon
          auto_resize="false"
@@ -126,29 +114,28 @@
          left="0"
          name="DUMMY"
          top="0"
-         width="5"/>   
+         width="4"/>
         <layout_panel
-         mouse_opaque="false"        
+         mouse_opaque="false"
          auto_resize="false"
          follows="right"
          height="28"
          layout="topleft"
          min_height="28"
          name="movement_panel"
-         width="70"
-         top_delta="-10"
-         min_width="70">
+         width="76"
+         min_width="76">
             <button
              follows="left|right"
-             height="20"
+             height="23"
              use_ellipses="true"
              is_toggle="true"
              label="Move"
              layout="topleft"
              name="movement_btn"
-             tool_tip="Shows/hides movement controls" 
-             top="6"
-             width="70">
+             tool_tip="Show/hide movement controls"
+             top="3"
+             width="76">
                 <button.init_callback
                  function="Button.SetDockableFloaterToggle"
                  parameter="moveview" />
@@ -164,75 +151,81 @@
          left="0"
          name="DUMMY"
          top="0"
-         width="8"/>
+         width="4"/>
         <layout_panel
-         mouse_opaque="false"        
+         mouse_opaque="false"
          auto_resize="false"
          follows="left|right"
          height="28"
          layout="topleft"
          min_height="28"
-         min_width="100"
+         min_width="76"
          name="cam_panel"
          top_delta="-10"
          width="100">
             <button
              follows="left|right"
-             height="20"
+             height="23"
              use_ellipses="true"
              is_toggle="true"
              label="View"
              layout="topleft"
              left="0"
-             tool_tip="Shows/hides camera controls" 
-             top="6"
+             tool_tip="Show/hide camera controls"
+             top="3"
              name="camera_btn"
-             width="70">
+             width="76">
                 <button.init_callback
                  function="Button.SetDockableFloaterToggle"
                  parameter="camera" />
             </button>
         </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="4"/>
         <layout_panel
-         mouse_opaque="false"        
+         mouse_opaque="false"
          auto_resize="false"
-         follows="right"
+         follows="left|right"
          height="28"
          layout="topleft"
-         min_height="28"
-         min_width="35"
          name="snapshot_panel"
-         top_delta="-10"
-         width="35">         
+         width="35">
             <split_button
              arrow_position="right"
-             follows="right"
-             height="18"
+         follows="left|right"
+             height="23"
              left="0"
-             layout="topleft"             
+             layout="topleft"
              name="snapshots"
-             top="6"
-             width="35">
-                <split_button.arrow_button 
-                 image_selected="camera_presets/camera_presets_arrow_right.png"
-                 image_unselected="camera_presets/camera_presets_arrow_right.png"
-                 image_disabled_selected="camera_presets/camera_presets_arrow_right.png" 
-                 image_disabled="camera_presets/camera_presets_arrow_right.png"
-                 name="snapshot_settings"
-                 tool_tip="Snapshot settings" />
+             width="46"
+             top="3">
                 <split_button.item
-                 image_selected="camera_presets/camera_presets_snapshot.png"
-                 image_unselected="camera_presets/camera_presets_snapshot.png"
+                 image_overlay="Snapshot_Off"
                  name="snapshot"
-                 tool_tip="Take snapshot" />
-            </split_button>                  
+                 tool_tip="Take snapshot"
+                 />
+                <split_button.arrow_button
+                 name="snapshot_settings"
+                 image_overlay="Widget_UpArrow"
+                 tool_tip="Snapshot and Preset Views"
+                 width="18"
+                 />
+            </split_button>
         </layout_panel>
         <layout_panel
          mouse_opaque="false"
          follows="left|right"
          height="28"
          layout="topleft"
-         min_height="28"
          top="0"
          name="chiclet_list_panel"
          width="189"
@@ -240,13 +233,13 @@
          user_resize="false"
          auto_resize="true">
             <chiclet_panel
-	         mouse_opaque="false"
+	    mouse_opaque="false"
              follows="left|right"
-             height="25"
+             height="28"
              layout="topleft"
              left="0"
              name="chiclet_list"
-             top="1"
+             top="0"
              chiclet_padding="3"
              scrolling_offset="40"
              width="189" />
@@ -261,36 +254,6 @@
          left="0"
          top="0"
          width="5"/>
-      <icon
-         auto_resize="false"
-         color="0 0 0 0"
-         follows="left|right"
-         height="10"
-         image_name="spacer24.tga"
-         layout="topleft"
-         left="0"
-         top="0"
-         width="10"/>
-        <view_border
-         auto_resize="false"
-         bevel_style="in"
-         follows="left|right"
-         height="28"
-         layout="topleft"
-         left="270"
-         name="well_separator"
-         top="0"
-         width="1" />
-        <icon
-         auto_resize="false"
-         color="0 0 0 0"
-         follows="left|right"
-         height="10"
-         image_name="spacer24.tga"
-         layout="topleft"
-         left="0"
-         top="0"
-         width="10"/>
         <layout_panel
          auto_resize="false"
          follows="right"
@@ -299,8 +262,8 @@
          min_height="28"
          top="0"
          name="sys_well_panel"
-         width="48"
-         min_width="48"
+         width="34"
+         min_width="34"
          user_resize="false">
             <chiclet_notification
              follows="right"
@@ -308,24 +271,25 @@
              layout="topleft"
              left="0"
              name="sys_well"
-             top="2"
-             width="48">
+             top="3"
+             width="34">
               <button
-               image_selected="bottom_tray_sys_notifications_selected.tga"
-               image_unselected="bottom_tray_sys_notifications.tga"/>
-              <unread_notifications
-               width="20"
-               height="20"
+              auto_resize="true"
+               halign="right"
+               height="23"
+               follows="right"
+               flash_color="EmphasisColor"
+               name="Unread"
+               picture_style="true"
+               image_overlay="Widget_UpArrow" />
+               <unread_notifications
+               width="34"
+               height="23"
                left="22"
-               top="23"/>
-<!-- 
-			  <chiclet_notification.commit_callback
-				 function="Notification.Show"
-				 parameter="ClickUnimplemented" />
- -->               				 
-			</chiclet_notification>
+               top="23" />
+	    </chiclet_notification>
         </layout_panel>
-        <icon
+       <icon
          auto_resize="false"
          color="0 0 0 0"
          follows="left|right"
@@ -334,6 +298,6 @@
          layout="topleft"
          left="0"
          top="0"
-         width="5"/>
+         width="10"/>
     </layout_stack>
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
index 2fd82d8f3d..af00b96d27 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -6,7 +6,7 @@
  layout="topleft"
  left="0"
  name="chat_bar"
- top="24"
+ top="21"
  width="310">
     <string name="min_width">
         310
@@ -18,20 +18,19 @@
      border_style="line"
      border_thickness="1"
      follows="left|right"
-     height="20"
+     height="23"
      label="Click here to chat."
      layout="topleft"
      left_delta="7"
      left="0"
      name="chat_box"
      tool_tip="Press Enter to say, Ctrl+Enter to shout"
-     top="3"
+     top="0"
      width="250" />
     <output_monitor
      auto_update="true"
      follows="right"
      draw_border="false"
-     halign="left"
      height="16"
      layout="topleft"
      left_pad="-24"
@@ -40,15 +39,15 @@
      top="4"
      visible="true"
      width="20" />
-    <button 
-     follows="right" 
+    <button
+     follows="right"
      width="45"
-     top="3" 
-     layout="topleft" 
-     left_pad="5"
-     label="Log" 
-     height="20"
-     tool_tip="Shows/hides nearby chat log">
+     top="0"
+     layout="topleft"
+     left_pad="8"
+     label="Log"
+     height="23"
+     tool_tip="Show/hide nearby chat log">
     <button.commit_callback function="Floater.Toggle" parameter="nearby_chat"/>
     </button>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/widgets/output_monitor.xml b/indra/newview/skins/default/xui/en/widgets/output_monitor.xml
index 505c7ba936..98b3e2faaa 100644
--- a/indra/newview/skins/default/xui/en/widgets/output_monitor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/output_monitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <output_monitor
-  image_mute="mute_icon.tga"
+  image_mute="parcel_lght_VoiceNo"
   image_off="VoicePTT_Off"
   image_on="VoicePTT_On"
   image_level_1="VoicePTT_Lvl1"
diff --git a/indra/newview/skins/default/xui/en/widgets/split_button.xml b/indra/newview/skins/default/xui/en/widgets/split_button.xml
index c0d3c6d7f6..2ff9ada90a 100644
--- a/indra/newview/skins/default/xui/en/widgets/split_button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/split_button.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<split_button 
+<split_button
  font="SansSerifSmall"
  arrow_position="left"
  follows="right|top">
-    <split_button.arrow_button 
-     name="Arrow Button"
-     label=""
-     font="SansSerifSmall"
-     scale_image="true"
-     image_selected="camera_presets/camera_presets_arrow.png"
-     image_unselected="camera_presets/camera_presets_arrow.png"
-     image_disabled_selected="camera_presets/camera_presets_arrow.png" 
-     image_disabled="camera_presets/camera_presets_arrow.png"
-     width="10"/>
     <split_button.items_panel
      background_visible="true"
      border="true"
      bg_alpha_color="1 1 1 1"
      bg_opaq_color="1 1 1 1"
+     scale_image="false"
+     image_selected="SegmentedBtn_Left_Selected"
+     image_unselected="SegmentedBtn_Left_Off"
      layout="topleft"
      name="item_buttons"
     />
+    <split_button.arrow_button
+     name="Arrow Button"
+     label=""
+     font="SansSerifSmall"
+     scale_image="false"
+     image_selected="SegmentedBtn_Right_Selected"
+     image_unselected="SegmentedBtn_Right_Off"
+     />
 </split_button>