From b7eb9a15f106789a499dc72a5c2979c3cf15ab1e Mon Sep 17 00:00:00 2001
From: Erica Olsen <erica@lindenlab.com>
Date: Tue, 20 Oct 2009 00:20:06 +0000
Subject: EXT-1376 Viewer 2.0 Fit & Finish Pass: People Panel - Friends
 EXT-1359 Viewer 2.0 Fit & Finish Pass: People Panel - Nearby

---
 .../default/xui/en/panel_avatar_list_item.xml      |  54 ++++------
 .../skins/default/xui/en/panel_group_list_item.xml |  27 +++--
 .../newview/skins/default/xui/en/panel_people.xml  | 118 +++++++++------------
 .../default/xui/en/widgets/flat_list_view.xml      |   2 +-
 4 files changed, 87 insertions(+), 114 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index 69d90e4c7d..2c9109449c 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -8,7 +8,7 @@
  top="0"
  width="320">
     <icon
-     follows="top|right|left" 
+     follows="top|right|left"
      height="24"
      image_name="ListItem_Over"
      layout="topleft"
@@ -40,23 +40,22 @@
      follows="left|right"
      font="SansSerifSmall"
      font.style="BOLD"
-     height="20"
+     height="15"
      layout="topleft"
      left_pad="5"
      name="avatar_name"
-     text_color="grey"
-     top="4"
-     use_ellipses="true" 
+     top="6"
+     use_ellipses="true"
      value="Unknown"
-     width="162" />
+     width="166" />
     <text
-     follows="right"
-     font="SansSerif"
-     height="20"
+     follows="left"
+     font="SansSerifSmall"
+     height="15"
      layout="topleft"
      left_pad="10"
      name="avatar_status"
-     text_color="0.5 0.5 0.5 1"
+     text_color="LtGray_50"
      value="Away"
      width="50" />
     <output_monitor
@@ -65,40 +64,31 @@
      draw_border="false"
      height="16"
      layout="topleft"
-     left_pad="3"
+     left_pad="0"
      mouse_opaque="true"
      name="speaking_indicator"
-     top="4"
      visible="true"
      width="20" />
     <button
      follows="right"
-     font="SansSerifBigBold"
-     height="18"
-     image_disabled="Info"
-     image_disabled_selected="Info"
-     image_hover_selected="Info"
-     image_selected="Info"
-     image_unselected="Info"
+     height="16"
+     image_pressed="Info_Press"
+     image_hover="Info_Over"
+     image_unselected="Info_Off"
      layout="topleft"
-     left_pad="2"
+     left_pad="5"
      name="info_btn"
      picture_style="true"
-     top="2"
-     width="18" />
+     width="16" />
     <button
      follows="right"
-     font="SansSerifBigBold"
-     height="18"
-     image_disabled="profile_chevron_btn.tga"
-     image_disabled_selected="profile_chevron_btn.tga"
-     image_hover_selected="profile_chevron_btn_active.tga"
-     image_selected="profile_chevron_btn_active.tga"
-     image_unselected="profile_chevron_btn.tga"
+     height="16"
+      image_selected="BuyArrow_Press"
+     image_pressed="BuyArrow_Press"
+     image_unselected="BuyArrow_Press"
      layout="topleft"
-     left_pad="2"
+     left_pad="5"
      name="profile_btn"
      picture_style="true"
-     top="2"
-     width="18" />
+     width="16" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
index 3f49bfad36..6eec0ffe7a 100644
--- a/indra/newview/skins/default/xui/en/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
@@ -8,7 +8,7 @@
  top="0"
  width="320">
     <icon
-     follows="top|right|left" 
+     follows="top|right|left"
      height="24"
      image_name="ListItem_Over"
      layout="topleft"
@@ -29,14 +29,14 @@
      width="320" />
     <icon
      follows="top|left"
-     height="18"
-     image_name="icon_group.tga"
+     height="20"
+     image_name="Generic_Group"
      layout="topleft"
      left="5"
      mouse_opaque="true"
-     name="group_icon" 
+     name="group_icon"
      top="4"
-     width="18" />
+     width="20" />
     <text
      follows="left|right"
      font="SansSerifSmall"
@@ -44,23 +44,20 @@
      layout="topleft"
      left_pad="5"
      name="group_name"
-     text_color="white"
      top="7"
-     use_ellipses="true" 
+     use_ellipses="true"
      value="Unknown"
      width="263" />
     <button
      follows="right"
-     height="18"
-     image_disabled="Info"
-     image_disabled_selected="Info"
-     image_hover_selected="Info"
-     image_selected="Info"
-     image_unselected="Info"
+     height="16"
+     image_pressed="Info_Press"
+     image_hover="Info_Over"
+     image_unselected="Info_Off"
      layout="topleft"
      name="info_btn"
      picture_style="true"
      right="-5"
-     top="4" 
-     width="18" />
+     top="4"
+     width="16" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index e53edf891d..8274beb538 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
 background_visible="true"
-color="DkGray"
+ draw_border="false"
  follows="all"
  height="570"
  label="People"
@@ -39,24 +39,26 @@ color="DkGray"
      height="23"
      layout="topleft"
      left="15"
+     label="Filter"
      max_length="300"
      name="filter_input"
-     text_color="black"
+     text_color="Black"
      top="3"
-     width="300" />
+     width="303" />
     <tab_container
      follows="all"
-     height="488"
+     height="500"
      layout="topleft"
      left="10"
      name="tabs"
-     bevel_style="in"
+     tab_min_width="70"
+     tab_height="30"
      tab_position="top"
-     top_pad="15"
+     top_pad="10"
      width="313">
         <panel
-          follows="all"
-         height="488"
+         follows="all"
+         height="500"
          label="Nearby"
          layout="topleft"
          left="0"
@@ -66,7 +68,7 @@ color="DkGray"
          width="313">
             <avatar_list
              follows="all"
-             height="430"
+             height="470"
              layout="topleft"
              left="0"
              name="avatar_list"
@@ -74,9 +76,6 @@ color="DkGray"
              volume_column_width="20"
              width="313" />
             <panel
-             background_visible="true"
-             bevel_style="none"
-            top_pad="0"
              follows="left|right|bottom"
              height="30"
              label="bottom_panel"
@@ -86,7 +85,7 @@ color="DkGray"
              width="313">
              <button
              follows="bottom|left"
-             tool_tip="Change sort and view of residents list"
+             tool_tip="Options"
              height="18"
              image_disabled="OptionsMenu_Disabled"
              image_selected="OptionsMenu_Press"
@@ -100,11 +99,8 @@ color="DkGray"
             </panel>
         </panel>
         <panel
-         background_visible="true"
-         bevel_style="none"
          follows="all"
-             color="DkGray2"
-         height="460"
+         height="500"
          left="0"
          top="0"
          label="Friends"
@@ -114,7 +110,7 @@ color="DkGray"
          width="313">
             <accordion
              follows="all"
-             height="430"
+             height="470"
              layout="topleft"
              left="0"
              name="friends_accordion"
@@ -153,9 +149,6 @@ color="DkGray"
                 </accordion_tab>
             </accordion>
             <panel
-             background_visible="true"
-             bevel_style="none"
-             top_pad="0"
              follows="left|right|bottom"
              height="30"
              label="bottom_panel"
@@ -165,7 +158,7 @@ color="DkGray"
              width="313">
                <button
                follows="bottom|left"
-               tool_tip="Change sort and view of friends list"
+               tool_tip="Options"
                height="18"
                image_disabled="OptionsMenu_Disabled"
                image_selected="OptionsMenu_Press"
@@ -196,7 +189,8 @@ color="DkGray"
                  image_unselected="TrashItem_Off"
                  image_disabled="TrashItem_Disabled"
                  layout="topleft"
-                 left_pad="230"
+                 left_pad="10"
+                 right="-10"
                  name="del_btn"
                  picture_style="true"
                  tool_tip="Remove selected person from your Friends list"
@@ -205,10 +199,8 @@ color="DkGray"
             </panel>
         </panel>
         <panel
-         background_visible="true"
-         bevel_style="none"
          follows="all"
-         height="390"
+         height="500"
          label="Groups"
          top="0"
          layout="topleft"
@@ -217,16 +209,13 @@ color="DkGray"
          width="313">
             <group_list
              follows="all"
-             height="357"
+             height="470"
              layout="topleft"
-             color="DkGray2"
              left="0"
              name="group_list"
-             top="2"
+             top="0"
              width="313" />
             <panel
-             background_visible="true"
-             bevel_style="none"
              top_pad="0"
              follows="left|right|bottom"
              height="30"
@@ -237,7 +226,7 @@ color="DkGray"
              width="313">
                <button
                follows="bottom|left"
-               tool_tip="Change sort and view of groups list"
+               tool_tip="Options"
                height="18"
                image_disabled="OptionsMenu_Disabled"
                image_selected="OptionsMenu_Press"
@@ -246,7 +235,7 @@ color="DkGray"
                left="10"
                name="groups_viewsort_btn"
                picture_style="true"
-               top="5"
+               top="7"
                width="18" />
                 <button
                  follows="bottom|left"
@@ -265,8 +254,8 @@ color="DkGray"
                  follows="bottom|left"
                  height="10"
                  image_hover_selected="Activate_Checkmark"
-     image_selected="Activate_Checkmark"
-     image_unselected="Activate_Checkmark"
+                 image_selected="Activate_Checkmark"
+                 image_unselected="Activate_Checkmark"
                  layout="topleft"
                  left_pad="24"
                  name="activate_btn"
@@ -280,7 +269,8 @@ color="DkGray"
                  image_selected="TrashItem_Press"
                  image_unselected="TrashItem_Off"
                  layout="topleft"
-                 left_pad="196"
+                left_pad="10"
+                 right="-10"
                  name="minus_btn"
                  picture_style="true"
                  tool_tip="Leave selected group"
@@ -289,20 +279,17 @@ color="DkGray"
             </panel>
         </panel>
         <panel
-         background_visible="true"
-         bevel_style="none"
          top="0"
          follows="all"
-         height="390"
+         height="500"
          label="Recent"
          layout="topleft"
          help_topic="people_recent_tab"
          name="recent_panel"
          width="313">
             <avatar_list
-             color="DkGray2"
              follows="all"
-             height="357"
+             height="470"
              layout="topleft"
              left="0"
              name="avatar_list"
@@ -321,8 +308,7 @@ color="DkGray"
              width="313">
                <button
                follows="bottom|left"
-               font="SansSerifBigBold"
-               tool_tip="Change sort and view of recent residents list"
+               tool_tip="Options"
                height="18"
                image_disabled="OptionsMenu_Disabled"
                image_selected="OptionsMenu_Press"
@@ -331,7 +317,7 @@ color="DkGray"
                left="10"
                name="recent_viewsort_btn"
                picture_style="true"
-               top="5"
+               top="7"
                width="18" />
             </panel>
         </panel>
@@ -340,7 +326,7 @@ color="DkGray"
      animate="false"
      border_size="0"
      follows="left|right|bottom"
-     height="27"
+     height="25"
      layout="topleft"
      left="10"
      name="button_bar"
@@ -357,8 +343,8 @@ color="DkGray"
          width="65">
             <button
              follows="top|left|right"
-             font="SansSerifSmallBold"
-             height="25"
+             font="SansSerifSmall"
+             height="19"
              label="Profile"
              layout="topleft"
              name="view_profile_btn"
@@ -374,29 +360,29 @@ color="DkGray"
          min_width="85"
          name="add_friend_btn_panel"
          top_delta="0"
-         width="85">
+         width="50">
             <button
              follows="top|left|right"
-             font="SansSerifSmallBold"
-             height="25"
-             label="Add Friend"
+             font="SansSerifSmall"
+             height="19"
+             label="Add"
              layout="topleft"
              name="add_friend_btn"
              tool_tip="Add selected resident to your friends List"
-             width="85" />
+             width="50" />
         </layout_panel>
         <layout_panel
          default_tab_group="1"
          follows="left|top|right"
-         height="25"
+         height="19"
          layout="topleft"
          min_width="80"
          name="group_info_btn_panel"
          width="80">
             <button
              follows="top|left|right"
-             font="SansSerifSmallBold"
-             height="25"
+             font="SansSerifSmall"
+             height="19"
              label="Group Profile"
              layout="topleft"
              name="group_info_btn"
@@ -414,8 +400,8 @@ color="DkGray"
          width="45">
             <button
              follows="top|left|right"
-             font="SansSerifSmallBold"
-             height="25"
+             font="SansSerifSmall"
+             height="19"
              label="Chat"
              layout="topleft"
              name="chat_btn"
@@ -433,8 +419,8 @@ color="DkGray"
          width="35">
             <button
              follows="top|left|right"
-             font="SansSerifSmallBold"
-             height="25"
+             font="SansSerifSmall"
+             height="19"
              label="IM"
              layout="topleft"
              name="im_btn"
@@ -454,8 +440,8 @@ color="DkGray"
             <button
              enabled="false"
              follows="top|left|right"
-             font="SansSerifSmallBold"
-             height="25"
+             font="SansSerifSmall"
+             height="19"
              label="Call"
              layout="topleft"
              name="call_btn"
@@ -472,15 +458,15 @@ color="DkGray"
          width="65">
             <button
              follows="left|top|right"
-             font="SansSerifSmallBold"
-             height="25"
+             font="SansSerifSmall"
+             height="19"
              label="Teleport"
              layout="topleft"
              name="teleport_btn"
              tool_tip="Offer teleport"
              width="65" />
         </layout_panel>
-        <layout_panel
+      <layout_panel
          default_tab_group="1"
          enabled="false"
          follows="left|top|right"
@@ -494,8 +480,8 @@ color="DkGray"
             <button
              enabled="false"
              follows="top|left|right"
-             font="SansSerifSmallBold"
-             height="25"
+             font="SansSerifSmall"
+             height="19"
              label="Share"
              layout="topleft"
              name="share_btn"
diff --git a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
index 8078579806..888b4eaf7c 100644
--- a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
+++ b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <flat_list_view
  allow_select="true"
- color="DkGray2"
+ color="PanelFocusBackgroundColor"
  item_pad="0"
  keep_one_selected="true"
  multi_select="false"
-- 
cgit v1.2.3