2 files changed, 30 insertions, 55 deletions
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 d19b36971f..8a0181bae4 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <multi_floater
- can_close="false"  
+ can_close="true"  
  can_minimize="true"
  can_resize="true"
  height="430"
@@ -17,7 +17,7 @@
          border="true"
          follows="top|bottom|left"
          layout="topleft"
-         name="conversations_list"
+         name="conversations_pane"
          opaque="true"
          top="0"
          left="5"
@@ -29,7 +29,7 @@
                  image_hover_unselected="Toolbar_Middle_Over"
                  image_overlay="OptionsMenu_Off"
                  image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
+                 image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  left="5"
                  name="sort_btn"
@@ -39,7 +39,7 @@
                  follows="top|left"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
-             	 image_overlay="AddItem_Off"
+                 image_overlay="AddItem_Off"
                  image_selected="Toolbar_Middle_Selected"
              	 image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
@@ -55,34 +55,20 @@
                  image_hover_unselected="Toolbar_Middle_Over"
                  image_overlay="TabIcon_Open_Off"
                  image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
+                 image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  top="5"
                  left="228"
-                 name="slide_left_btn"
+                 name="expand_collapse_btn"
                  width="31" />
-             <button
-                 follows="right|top"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="TabIcon_Close_Off"
-                 image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 top="5"
-                 left_delta="0"
-                 name="slide_right_btn"
-                 width="31" />            
-     </panel>
+    </panel>
     <panel_container
-         follows="all"
-         layout="topleft"
-         name="im_box_tab_container"
-         opaque="true"
-         top="0"
-         left_pad="15"
-         height="430"
-         width="389"
-         min_width="290">         
-     </panel_container>
+     follows="all"
+     height="430"
+     layout="topleft"
+     left_pad="15"
+     min_width="290"
+     name="im_box_tab_container"
+     top="0"
+     width="389"/>
 </multi_floater>
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 d90947a80a..954f646bae 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -12,8 +12,21 @@
  visible="false"
  width="394"
  can_resize="true"
+ can_tear_off="false"
  min_width="250"
  min_height="190">
+    <floater.string
+     name="collapse_icon"
+     value="TabIcon_Open_Off"/>
+    <floater.string
+     name="expand_icon"
+     value="TabIcon_Close_Off"/>
+    <floater.string
+     name="tear_off_icon"
+     value="tearoffbox.tga"/>
+    <floater.string
+     name="return_icon"
+     value="Icon_Dock_Foreground"/>
     <view
         follows="all"
         layout="topleft"
@@ -23,7 +36,7 @@
         height="355"
         width="394"> 
      <panel
-         follows="all"
+         follows="left|top|right"
          layout="topleft"
          name="toolbar_panel"
          top="0"
@@ -95,19 +108,7 @@
                  layout="topleft"
                  top="5"
                  left_pad="5"
-                 name="slide_left_btn"
-                 width="31" />
-             <button
-                 follows="right|top"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="TabIcon_Close_Off"
-                 image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 top="5"
-                 left_delta="0"
-                 name="slide_right_btn"
+                 name="expand_collapse_btn"
                  width="31" />
              <button
                  follows="right|top"
@@ -121,18 +122,6 @@
                  left_pad="5"
                  name="tear_off_btn"
                  width="31" />
-             <button
-                 follows="right|top"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Icon_Dock_Foreground"
-                 image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 top="5"
-                 left_delta="0"
-                 name="return_btn"
-                 width="31" />
      </panel>
   <layout_stack
    animate="true"