merge -r 2005-2011 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3

* Bugs: EXT-1472 EXT-996

2 files changed, 29 insertions, 33 deletions

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 0921ccfb95..611c51ad11 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -11,10 +11,10 @@
  can_dock="true"
  can_minimize="true"
  visible="true" 
- width="315">
+ width="365">
   <layout_stack follows="left|top|right|bottom"
                 height="235"
-                width="315"
+                width="365"
                 layout="topleft"
                 orientation="horizontal"
                 name="im_panels"
@@ -25,13 +25,13 @@
       layout="topleft"
       top_delta="-3"
       min_width="96" 
-      width="96"
+      width="146"
       height="225"
       label="IM Control Panel"
       user_resize="false" />
     <layout_panel height="235"
                   width="200"
-                  left_delta="96" 
+                  left_delta="146" 
                   top="0"
                   user_resize="false">
       <button height="12"
diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
index a9363df259..be38492c82 100644
--- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
@@ -1,31 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="panel_im_control_panel"
-       width="96"
-       height="215"
-       border="false">
-  <avatar_list
-           width="90"
-           column_padding="0"
-           draw_heading="true"
-           draw_stripes="false"
-           follows="left|top|bottom|right"
-           layout="topleft"
-           left="3"
-           name="speakers_list"
-           search_column="1"
-           sort_column="2"
-           top="10"
-           height="150" />
-
-  <button name="group_info_btn"
-          label="Group Info"
-          left_delta="3"
-          width="90"
-		  height="20" />
-
-  <button name="call_btn"
-          label="Call"
-          width="90"
-          height="20" />
-
+<panel
+ name="panel_im_control_panel"
+ width="146"
+ height="215"
+ border="false">
+    <avatar_list_tmp
+     color="DkGray2"
+     follows="left|top|right|bottom"
+     height="150"
+     layout="topleft"
+     left="3"
+     name="speakers_list"
+     top="10"
+     width="140"/>
+    <button
+     name="group_info_btn"
+     label="Group Info"
+     left_delta="3"
+     width="90"
+     height="20" />
+    <button
+     name="call_btn"
+     label="Call"
+     width="90"
+     height="20" />
 </panel>