8 files changed, 142 insertions, 23 deletions

diff --git a/linden/indra/newview/llcallingcard.cpp b/linden/indra/newview/llcallingcard.cpp
index db28c7a..155fb60 100644
--- a/linden/indra/newview/llcallingcard.cpp
+++ b/linden/indra/newview/llcallingcard.cpp
@@ -357,6 +357,11 @@ void LLAvatarTracker::setBuddyOnline(const LLUUID& id, bool is_online)
         }
 }
 
+S32 LLAvatarTracker::getBuddyCount()
+{
+        return mBuddyInfo.size();
+}
+
 bool LLAvatarTracker::isBuddyOnline(const LLUUID& id) const
 {
         LLRelationship* info = get_ptr_in_map(mBuddyInfo, id);
diff --git a/linden/indra/newview/llcallingcard.h b/linden/indra/newview/llcallingcard.h
index 85a1ab6..0db5376 100644
--- a/linden/indra/newview/llcallingcard.h
+++ b/linden/indra/newview/llcallingcard.h
@@ -129,6 +129,9 @@ public:
         void setBuddyOnline(const LLUUID& id, bool is_online);
         bool isBuddyOnline(const LLUUID& id) const;
 
+        // get count of buddies
+        S32 getBuddyCount();
+
         // simple empowered status
         void setBuddyEmpowered(const LLUUID& id, bool is_empowered);
         bool isBuddyEmpowered(const LLUUID& id) const;
diff --git a/linden/indra/newview/llfloaterfriends.cpp b/linden/indra/newview/llfloaterfriends.cpp
index e18e705..479da89 100644
--- a/linden/indra/newview/llfloaterfriends.cpp
+++ b/linden/indra/newview/llfloaterfriends.cpp
@@ -183,6 +183,52 @@ void LLPanelFriends::updateFriends(U32 changed_mask)
         mShowMaxSelectWarning = true;
 }
 
+void LLPanelFriends::filterContacts(const std::string& search_string)
+{
+        std::string search = search_string;
+        LLStringUtil::toLower(search);
+                
+        if (search.empty())
+        {
+                // repopulate
+                refreshNames(LLFriendObserver::ADD);
+        }
+        else
+        {
+                // just in case someone else emptied us, tsk
+                if (mFriendsList->isEmpty() && LLAvatarTracker::instance().getBuddyCount() > 0)
+                {
+                        refreshNames(LLFriendObserver::ADD);
+                }
+
+                // don't worry about maintaining selection since we're searching
+                std::vector<LLScrollListItem*> vFriends(mFriendsList->getAllData());
+                
+                // this should really REALLY use deleteAllItems() to rebuild the list instead
+                std::string friend_name;
+                for (std::vector<LLScrollListItem*>::iterator itr = vFriends.begin(); itr != vFriends.end(); ++itr)
+                {
+                        friend_name = (*itr)->getColumn(LIST_FRIEND_NAME)->getValue().asString();
+                        LLStringUtil::toLower(friend_name);
+                        BOOL show_entry = (friend_name.find(search) != std::string::npos);
+                        if (!show_entry)
+                        {
+                                mFriendsList->deleteItems((*itr)->getValue());
+                        }
+                }
+        }
+        refreshUI();
+}
+
+void LLPanelFriends::onContactSearchKeystroke(const std::string& search_string, void* user_data)
+{
+        LLPanelFriends* panelp = (LLPanelFriends*)user_data;
+        if (panelp)
+        {
+                panelp->filterContacts(search_string);
+        }
+}
+
 // virtual
 BOOL LLPanelFriends::postBuild()
 {
@@ -193,6 +239,12 @@ BOOL LLPanelFriends::postBuild()
         childSetCommitCallback("friend_list", onSelectName, this);
         childSetDoubleClickCallback("friend_list", onClickIM);
 
+        LLSearchEditor* buddy_search = getChild<LLSearchEditor>("buddy_search");
+        if (buddy_search)
+        {
+                buddy_search->setSearchCallback(&onContactSearchKeystroke, this);
+        }
+
         U32 changed_mask = LLFriendObserver::ADD | LLFriendObserver::REMOVE | LLFriendObserver::ONLINE;
         refreshNames(changed_mask);
 
diff --git a/linden/indra/newview/llfloaterfriends.h b/linden/indra/newview/llfloaterfriends.h
index f7f0b32..9a1feba 100644
--- a/linden/indra/newview/llfloaterfriends.h
+++ b/linden/indra/newview/llfloaterfriends.h
@@ -101,6 +101,8 @@ private:
         // protected members
         typedef std::map<LLUUID, S32> rights_map_t;
         void refreshNames(U32 changed_mask);
+        void filterContacts(const std::string& search_string);
+
         BOOL refreshNamesSync(const LLAvatarTracker::buddy_map_t & all_buddies);
         BOOL refreshNamesPresence(const LLAvatarTracker::buddy_map_t & all_buddies);
         void refreshUI();
@@ -126,7 +128,7 @@ private:
         static bool callbackAddFriendWithMessage(const LLSD& notification, const LLSD& response);
         static void onPickAvatar(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* user_data);
         static void onMaximumSelect(void* user_data);
-
+        static void onContactSearchKeystroke(const std::string& search_string, void* user_data);
         static void onClickIM(void* user_data);
         static void onClickProfile(void* user_data);
         static void onClickAddFriend(void* user_data);
diff --git a/linden/indra/newview/llfloatergroups.cpp b/linden/indra/newview/llfloatergroups.cpp
index daf1709..b3fbb1b 100644
--- a/linden/indra/newview/llfloatergroups.cpp
+++ b/linden/indra/newview/llfloatergroups.cpp
@@ -214,6 +214,12 @@ BOOL LLPanelGroups::postBuild()
 {
         childSetCommitCallback("group list", onGroupList, this);
 
+        LLSearchEditor* group_search = getChild<LLSearchEditor>("group_search");
+        if (group_search)
+        {
+                group_search->setSearchCallback(&onGroupSearchKeystroke, this);
+        }
+
         childSetTextArg("groupcount", "[COUNT]", llformat("%d",gAgent.mGroups.count()));
         childSetTextArg("groupcount", "[MAX]", llformat("%d", gHippoLimits->getMaxAgentGroups()));
 
@@ -379,7 +385,7 @@ void LLPanelGroups::info()
 
 void LLPanelGroups::startIM()
 {
-        //llinfos << "LLPanelFriends::onClickIM()" << llendl;
+        //llinfos << "LLPanelGroups::onClickIM()" << llendl;
         LLCtrlListInterface *group_list = childGetListInterface("group list");
         LLUUID group_id;
 
@@ -612,3 +618,47 @@ void LLPanelGroups::applyChangesToGroups()
                 }
         }
 }
+
+void LLPanelGroups::filterContacts(const std::string& search_string)
+{
+        std::string search = search_string;
+        LLStringUtil::toLower(search);
+
+        if (search.empty())
+        {
+                // repopulate
+                reset();
+        }
+        else
+        {
+                LLScrollListCtrl* group_list = getChild<LLScrollListCtrl>("group list");
+                if (group_list)
+                {
+                        // don't worry about maintaining selection since we're searching
+                        std::vector<LLScrollListItem*> vGroups(group_list->getAllData());
+
+                        // this should really REALLY use deleteAllItems() to rebuild the list instead
+                        std::string group_name;
+                        for (std::vector<LLScrollListItem*>::iterator itr = vGroups.begin(); itr != vGroups.end(); ++itr)
+                        {
+                                group_name = (*itr)->getColumn(0)->getValue().asString();
+                                LLStringUtil::toLower(group_name);
+                                BOOL show_entry = (group_name.find(search) != std::string::npos);
+                                if (!show_entry)
+                                {
+                                        group_list->deleteItems((*itr)->getValue());
+                                }
+                        }
+                        enableButtons();
+                }
+        }
+}
+
+void LLPanelGroups::onGroupSearchKeystroke(const std::string& search_string, void* user_data)
+{
+        LLPanelGroups* panelp = (LLPanelGroups*)user_data;
+        if (panelp)
+        {
+                panelp->filterContacts(search_string);
+        }
+}
diff --git a/linden/indra/newview/llfloatergroups.h b/linden/indra/newview/llfloatergroups.h
index 91021f0..5dc7ad8 100644
--- a/linden/indra/newview/llfloatergroups.h
+++ b/linden/indra/newview/llfloatergroups.h
@@ -115,6 +115,7 @@ protected:
         static void onBtnInvite(void* userdata);
         static void onBtnTitles(void* userdata);
         static void onDoubleClickGroup(void* userdata);
+        static void onGroupSearchKeystroke(const std::string& search_string, void* user_data);
 
         void create();
         void activate();
@@ -125,9 +126,9 @@ protected:
         void callVote();
         void invite();
         void titles();
+        void filterContacts(const std::string& search_string);
 
         static bool callbackLeaveGroup(const LLSD& notification, const LLSD& response);
-
 };
 
 
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>