From bc5ad04d6164d186cf504212ea559405b8608811 Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Fri, 5 Feb 2010 09:41:54 +0200
Subject: applying patch for EXT-2357

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_im_container.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index bd25288a9e..0d1a4a831d 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -19,8 +19,13 @@
      left="1"
      name="im_box_tab_container"
      tab_position="bottom"
-     tab_width="80"
+     tab_width="64"
+     tab_max_width = "134"
+     tab_icon_ctrl_width = "16"
+     tab_icon_ctrl_height = "16"
      tab_height="16"
+     use_custom_icon_ctrl="true"
+     tab_icon_ctrl_pad="2"
      top="0"
      width="390" />
     <icon
-- 
cgit v1.2.3


From b79b8f87a37888decd3f82e9e255cce641a3955f Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Fri, 5 Feb 2010 13:03:26 +0200
Subject: finished with EXT-2753 - Implement Avatar icons on IM multifloater
 tabs add floater flashing, fix group icon sizes, fix click,some code cleanup,
 ect. also I remove mIconCtrlWidth/Height since its kinda useless -
 mIconCtrlPad do the same thing... IconSize will be btn_height-2*mIconCtrlPad
 - simple and good enough.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_im_container.xml | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 0d1a4a831d..978b40da77 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -21,8 +21,6 @@
      tab_position="bottom"
      tab_width="64"
      tab_max_width = "134"
-     tab_icon_ctrl_width = "16"
-     tab_icon_ctrl_height = "16"
      tab_height="16"
      use_custom_icon_ctrl="true"
      tab_icon_ctrl_pad="2"
-- 
cgit v1.2.3


From e7889301723e23b94813464a4519ee6a7751f413 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 9 Feb 2010 10:06:52 +0200
Subject: Fixed normal bug EXT - 4878 (Tab labels are no longer obeying halign
 attribute)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_im_container.xml | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 978b40da77..964713adbf 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -24,6 +24,8 @@
      tab_height="16"
      use_custom_icon_ctrl="true"
      tab_icon_ctrl_pad="2"
+     font_halign="left"
+     use_ellipses="true"
      top="0"
      width="390" />
     <icon
-- 
cgit v1.2.3


From 366aa236f2964855bcb6f8b95f52e8bdad902651 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 17 Feb 2010 14:37:28 -0800
Subject: EXT-5461 - Installing 1.23.5 release version over recent 2.0 builds
 corrupts 1.23s UI

reviewed by Leyla
---
 .../skins/default/xui/en/floater_im_container.xml  | 42 ----------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/floater_im_container.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
deleted file mode 100644
index 964713adbf..0000000000
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater
- can_close="false"  
- can_minimize="true"
- can_resize="true"
- height="390"
- layout="topleft"
- name="floater_im_box"
- help_topic="floater_im_box"
- save_rect="true"
- save_visibility="true"
- single_instance="true"
- title="CONVERSATIONS"
- width="392">
-    <tab_container
-     follows="left|right|top|bottom"
-     height="390"
-     layout="topleft"
-     left="1"
-     name="im_box_tab_container"
-     tab_position="bottom"
-     tab_width="64"
-     tab_max_width = "134"
-     tab_height="16"
-     use_custom_icon_ctrl="true"
-     tab_icon_ctrl_pad="2"
-     font_halign="left"
-     use_ellipses="true"
-     top="0"
-     width="390" />
-    <icon
-     color="DefaultShadowLight"
-     enabled="false"
-     follows="left|right|bottom"
-     height="17"
-     image_name="tabarea.tga"
-     layout="bottomleft"
-     left="1"
-     name="im_box_tab_container_icon"
-     bottom="10"
-     width="390" />
-</multi_floater>
-- 
cgit v1.2.3


From 9dbe107f4e547d1aec0a234eaa0e6f83dd987898 Mon Sep 17 00:00:00 2001
From: Kent Quirk <q@lindenlab.com>
Date: Thu, 18 Feb 2010 20:37:37 -0500
Subject: move base back to default because doing it as a backout was causing
 merge errors

---
 .../skins/default/xui/en/floater_im_container.xml  | 42 ++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_im_container.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
new file mode 100644
index 0000000000..964713adbf
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater
+ can_close="false"  
+ can_minimize="true"
+ can_resize="true"
+ height="390"
+ layout="topleft"
+ name="floater_im_box"
+ help_topic="floater_im_box"
+ save_rect="true"
+ save_visibility="true"
+ single_instance="true"
+ title="CONVERSATIONS"
+ width="392">
+    <tab_container
+     follows="left|right|top|bottom"
+     height="390"
+     layout="topleft"
+     left="1"
+     name="im_box_tab_container"
+     tab_position="bottom"
+     tab_width="64"
+     tab_max_width = "134"
+     tab_height="16"
+     use_custom_icon_ctrl="true"
+     tab_icon_ctrl_pad="2"
+     font_halign="left"
+     use_ellipses="true"
+     top="0"
+     width="390" />
+    <icon
+     color="DefaultShadowLight"
+     enabled="false"
+     follows="left|right|bottom"
+     height="17"
+     image_name="tabarea.tga"
+     layout="bottomleft"
+     left="1"
+     name="im_box_tab_container_icon"
+     bottom="10"
+     width="390" />
+</multi_floater>
-- 
cgit v1.2.3


From d47ca7a671255adf6c4f16114516effde507ae3a Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 23 Feb 2010 07:51:05 +0200
Subject: No ticket. Set correct tag name for tab label attrbute in tabbed IM
 floater.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_im_container.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 964713adbf..65a05f3ec5 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -24,7 +24,7 @@
      tab_height="16"
      use_custom_icon_ctrl="true"
      tab_icon_ctrl_pad="2"
-     font_halign="left"
+     halign="left"
      use_ellipses="true"
      top="0"
      width="390" />
-- 
cgit v1.2.3