Added search bars for friends and groups lists, based on a feature in the Ascent viewer by Charley Levenque

2 files changed, 26 insertions, 20 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml b/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml
index 0854c99..a64560f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml
@@ -3,43 +3,46 @@
         <string name="Multiple">
                 Multiple friends...
         </string>
-        <scroll_list bottom="10" can_resize="true" column_padding="0" draw_heading="true"
+  <scroll_list bottom="10" can_resize="true" column_padding="0" draw_heading="true"
              follows="left|top|bottom|right" left="10" multi_select="true"
              name="friend_list" right="-100" search_column="1"
              tool_tip="Hold shift or control while clicking to select multiple friends"
-             top="-10">
-                <column image="ff_online_status_button.tga" name="icon_online_status"
+             top="-30">
+    <column image="ff_online_status_button.tga" name="icon_online_status"
                      tool_tip="Online status" width="20" />
-                <column dynamicwidth="true" label="Name" name="friend_name" tool_tip="Name" />
-                <column image="ff_visible_online_button.tga" name="icon_visible_online"
+    <column dynamicwidth="true" label="Name" name="friend_name" tool_tip="Name" />
+    <column image="ff_visible_online_button.tga" name="icon_visible_online"
                      tool_tip="Friend can see when you&apos;re online" width="20" />
-                <column image="ff_visible_map_button.tga" name="icon_visible_map"
+    <column image="ff_visible_map_button.tga" name="icon_visible_map"
                      tool_tip="Friend can locate you on the map" width="20" />
-                <column image="ff_edit_mine_button.tga" name="icon_edit_mine"
+    <column image="ff_edit_mine_button.tga" name="icon_edit_mine"
                      tool_tip="Friend can edit, delete or take objects" width="20" />
-                <column image="ff_visible_map_button.tga" name="icon_visible_map_theirs"
+    <column image="ff_visible_map_button.tga" name="icon_visible_map_theirs"
                      tool_tip="You can  locate this friend on the map" width="20" />
-                <column image="ff_edit_theirs_button.tga" name="icon_edit_theirs"
+    <column image="ff_edit_theirs_button.tga" name="icon_edit_theirs"
                      tool_tip="You can edit this friend&apos;s objects" width="20" />
-                <column name="friend_last_update_generation" width="0" />
-        </scroll_list>
-        <pad bottom="-7" height="0" left="-90" width="1" />
-        <button bottom_delta="-25" follows="top|right" height="22" label="IM/Call"
+    <column name="friend_last_update_generation" width="0" />
+  </scroll_list>
+  <pad bottom="-7" height="0" left="-90" width="1" />
+  <button bottom_delta="-45" follows="top|right" height="22" label="IM/Call"
              left_delta="0" name="im_btn" tool_tip="Open Instant Message session"
              width="80" />
-        <button bottom_delta="-25" follows="top|right" height="22" label="Profile"
+  <button bottom_delta="-25" follows="top|right" height="22" label="Profile"
              left_delta="0" name="profile_btn"
              tool_tip="Show picture, groups, and other information" width="80" />
-        <button bottom_delta="-25" follows="top|right" height="22" label="Teleport..."
+  <button bottom_delta="-25" follows="top|right" height="22" label="Teleport..."
              left_delta="0" name="offer_teleport_btn"
              tool_tip="Offer this friend a teleport to your current location" width="80" />
-        <button bottom_delta="-25" follows="top|right" height="22" label="Pay..."
+  <button bottom_delta="-25" follows="top|right" height="22" label="Pay..."
              left_delta="0" name="pay_btn"
              tool_tip="Give currency to this friend" width="80" />
-        <button bottom_delta="-25" follows="top|right" height="22" label="Remove..."
+  <button bottom_delta="-25" follows="top|right" height="22" label="Remove..."
              left_delta="0" name="remove_btn"
              tool_tip="Remove this person from your friends list" width="80" />
-        <button bottom_delta="-35" follows="top|right" height="22" label="Add..."
+  <button bottom_delta="-35" follows="top|right" height="22" label="Add..."
              left_delta="0" name="add_btn" tool_tip="Offer friendship to a resident"
              width="80" />
+  <search_editor bottom="-24" enabled="true" follows="left|right|top" font="SansSerif"
+       height="18" left="10" right="-100" name="buddy_search"
+       label="Type here to search your friends" width="130" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
index 22967dc..9303852 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
@@ -4,7 +4,7 @@
         <scroll_list background_visible="true" bottom="45" column_padding="5" draw_border="true"
              draw_heading="true" draw_stripes="true" enabled="true"
              follows="left|top|right|bottom" left="10" mouse_opaque="true"
-             multi_select="false" name="group list" tab_stop="true" top="-10"
+             multi_select="false" name="group list" tab_stop="true" top="-30"
              width="240">
                 <column label="Group Name" name="name" dynamicwidth="true" />
     <column label="Notices" name="receive_notices" width="60" 
@@ -28,7 +28,7 @@
                 You belong to [COUNT] groups (of [MAX] maximum).
         </text>
         <pad bottom="-7" height="0" left="-90" width="1" />
-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+        <button bottom_delta="-45" follows="top|right" font="SansSerif" height="22"
              label="IM/Call" left_delta="0" name="IM"
              tool_tip="Open Instant Message session" width="80" />
         <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
@@ -45,6 +45,9 @@
              label="Search..." name="Search..." width="80" />
         <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
              label="Leave" name="Leave" width="80" />
+  <search_editor bottom="-24" enabled="true" follows="left|right|top" font="SansSerif"
+       height="18" left="10" right="-100" name="group_search"
+       label="Type here to search your groups" width="130" />
   <string name="none">
                 none
   </string>