From 6820f18ec50ba13c20cad773b8bc6744420ea72f Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Mon, 16 Nov 2009 20:23:01 -0800
Subject: EXT-2537 Update IM message well arrows with actual art, style
 chiclets to spec, EXT-2536 Remove old art from scrollbar headers, clean up
 layout

---
 .../skins/default/xui/en/floater_im_session.xml    | 65 +++++++++++-----------
 .../skins/default/xui/en/panel_chat_item.xml       | 12 ++--
 .../default/xui/en/panel_im_control_panel.xml      | 22 ++++----
 .../xui/en/widgets/scroll_column_header.xml        | 14 +++--
 4 files changed, 56 insertions(+), 57 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 452d28d4ea..9e2dbc881f 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -2,66 +2,63 @@
 <floater
  legacy_header_height="18"
  background_visible="true"
- follows="left|top|right|bottom"
- height="369"
+ follows="all"
+ height="350"
  layout="topleft"
  left="0"
  name="panel_im"
- help_topic="panel_im"
  top="0"
  can_dock="true"
- can_minimize="true"
- visible="true" 
- width="520"
+ can_minimize="false"
+ visible="true"
+ width="320"
  can_resize="true"
- min_width="350"
- min_height="369">
-  <layout_stack follows="left|top|right|bottom"
-                height="354"
-                width="520"
+ min_width="300"
+ min_height="350">
+  <layout_stack follows="all"
+                height="350"
+                width="300"
                 layout="topleft"
                 orientation="horizontal"
                 name="im_panels"
-                top="16"
-                left="2">
+                top="20"
+                left="0">
     <layout_panel
       name="panel_im_control_panel"
       layout="topleft"
       top_delta="-3"
-      height="354"
+      height="350"
       follows="left"
       label="IM Control Panel"
       auto_resize="false"
       user_resize="false" />
-    <layout_panel height="354"
-                  width="355"
-                  left_delta="146" 
+    <layout_panel height="350"
+                  width=""
+                  left_delta="110"
                   top="0"
                   user_resize="false">
-      <button height="12"
-      		  follows="left|top"
-              top="8" 
-              label="&lt;&lt;"
+      <button height="20"
+      	      follows="left|top"
+              top="0"
+              image_overlay="TabIcon_Open_Off"
               layout="topleft"
-              width="35"
+              width="25"
               name="slide_left_btn" />
-      <button height="12"
-      		  follows="left|top"
-              top="8"
-              label="&gt;&gt;"
-              layout="topleft"
-              width="35"
+      <button height="20"
+      	      follows="left|top"
+              top="0"
+              image_overlay="TabIcon_Close_Off"
+              width="25"
               name="slide_right_btn" />
       <chat_history
        length="1"
-       follows="left|top|right|bottom"
-       font="SansSerif"
-       height="300"
+       follows="all"
+       height="275"
        layout="topleft"
        name="chat_history"
        parse_highlights="true"
-       allow_html="true" 
-       width="350">
+       allow_html="true"
+       width="160">
       </chat_history>
       <line_editor
        follows="left|right"
@@ -69,7 +66,7 @@
        label="To"
        layout="topleft"
        name="chat_editor"
-       width="345">
+       width="160">
       </line_editor>
     </layout_panel>
   </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml
index 9e071072f2..01917052d1 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml
@@ -6,11 +6,12 @@
   height="180"
   follows="all">
 	<panel
-	width="250"
+	width="290"
 	height="24"
 	background_visible="true"
 	background_opaque="false"
 	bg_alpha_color="Black"
+	left="5"
 	name="msg_caption">
              <avatar_icon
          follows="left"
@@ -25,9 +26,9 @@
     	<text
                 font.style="BOLD"
                 height="12"
-         layout="topleft"
-	 left_pad="5"
-	 top="7"
+	    layout="topleft"
+	    left_pad="5"
+	    top="7"
 		text_color="white"
 		word_wrap="false"
 		use_ellipses="true"
@@ -46,7 +47,7 @@
 	 halign="right"
          height="13"
          layout="topleft"
-         right="-5"
+         right="-10"
 	 left="205"
 	 mouse_opaque="true"
       name="msg_time"
@@ -65,5 +66,6 @@
       word_wrap="true"
       mouse_opaque="true"
       name="msg_text">
+      To be or not to be, that is the question. Tis a far far better thing I do than I have ever done. Tis a far far better place I go, than I have ever been.
 	</text_chat>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index 44305f7dea..9573904c93 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  border="false"
- height="350"
+ height="300"
  name="panel_im_control_panel"
  width="110">
     <avatar_icon
@@ -14,38 +14,38 @@
     <text
      follows="top|left|right"
      font="SansSerifLarge"
-     height="16"
+     height="22"
      layout="topleft"
      name="avatar_name"
      use_ellipses="true"
      value="Unknown"
      width="100" />
     <button
-     follows="left|bottom"
+     follows="left|top"
      height="20"
      label="Profile"
      name="view_profile_btn"
      width="100" />
     <button
-     follows="left|bottom"
+     follows="left|top"
      height="20"
      label="Add Friend"
      name="add_friend_btn"
      width="100" />
     <button
-     follows="left|bottom"
+     follows="left|top"
      height="20"
      label="Teleport"
      name="teleport_btn"
      width="100" />
     <button
-     follows="left|bottom"
+     follows="left|top"
      height="20"
      label="Share"
      name="share_btn"
      width="100" />
     <button
-     follows="left|bottom"
+     follows="left|top"
      height="20"
      label="Pay"
      name="pay_btn"
@@ -54,13 +54,11 @@
      background_visible="true"
      bg_alpha_color="DkGray2"
      border="false"
-     bottom="1"
-     follows="left|bottom"
+     follows="left|top"
      height="70"
      left="0"
      left_pad="0"
      name="panel_call_buttons"
-     top_pad="0"
      width="110">
         <button
          bottom="10"
@@ -70,7 +68,7 @@
          name="call_btn"
          width="100" />
         <button
-         bottom="40"
+         bottom="35"
          height="20"
          label="Leave Call"
          name="end_call_btn"
@@ -80,7 +78,7 @@
          enabled="false"
          bottom="10"
          height="20"
-         label="Open Voice Controls"
+         label="Voice Controls"
          name="voice_ctrls_btn"
          visible="false"
          width="100" />
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml b/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml
index 0794b49a0c..f936a1e208 100644
--- a/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<scroll_column_header image_unselected="square_btn_32x128.tga"
-                      image_selected="square_btn_selected_32x128.tga"
-                      image_disabled="square_btn_32x128.tga"
-                      image_disabled_selected="square_btn_selected_32x128.tga"
-                      image_overlay="combobox_arrow.tga"
+<scroll_column_header
+		    image_unselected="SegmentedBtn_Middle_Selected"
+                      image_selected="SegmentedBtn_Middle_Selected"
+		      image_pressed="SegmentedBtn_Middle_Selected_Press"
+                      image_disabled="SegmentedBtn_Middle_Disabled"
+                      image_disabled_selected="SegmentedBtn_Middle_Selected_Disabled"
+                      image_overlay="DisclosureArrow_Opened_Off"
                       image_overlay_alignment="right"
                       halign="left"
-                      scale_image="true"/>
+                      scale_image="true" />
-- 
cgit v1.2.3