Made searching contacts suck a lot less

2 files changed, 47 insertions, 37 deletions

diff --git a/linden/indra/newview/llfloaterfriends.cpp b/linden/indra/newview/llfloaterfriends.cpp
index a151a33..67d9626 100644
--- a/linden/indra/newview/llfloaterfriends.cpp
+++ b/linden/indra/newview/llfloaterfriends.cpp
@@ -151,7 +151,7 @@ void LLPanelFriends::updateFriends(U32 changed_mask)
         LLDynamicArray<LLUUID> selected_friends = getSelectedIDs();
         if(changed_mask & (LLFriendObserver::ADD | LLFriendObserver::REMOVE | LLFriendObserver::ONLINE))
         {
-                refreshNames(changed_mask);
+                refreshNames(changed_mask, "");
         }
         else if(changed_mask & LLFriendObserver::POWERS)
         {
@@ -185,39 +185,14 @@ void LLPanelFriends::updateFriends(U32 changed_mask)
 
 void LLPanelFriends::filterContacts(const std::string& search_string)
 {
-        std::string search = search_string;
-        LLStringUtil::toLower(search);
-                
-        if (search.empty())
+        if (search_string.empty())
         {
-                // repopulate
-                refreshNames(LLFriendObserver::ADD);
+                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());
-                        }
-                }
+                refreshNames(LLFriendObserver::ADD, search_string);
         }
-        mFriendsList->setScrollPos(0);
         refreshUI();
 }
 
@@ -247,7 +222,7 @@ BOOL LLPanelFriends::postBuild()
         }
 
         U32 changed_mask = LLFriendObserver::ADD | LLFriendObserver::REMOVE | LLFriendObserver::ONLINE;
-        refreshNames(changed_mask);
+        refreshNames(changed_mask, "");
 
         childSetAction("im_btn", onClickIM, this);
         childSetAction("profile_btn", onClickProfile, this);
@@ -454,7 +429,7 @@ struct SortFriendsByID
         }
 };
 
-void LLPanelFriends::refreshNames(U32 changed_mask)
+void LLPanelFriends::refreshNames(U32 changed_mask, const std::string& filter_string)
 {
         LLDynamicArray<LLUUID> selected_ids = getSelectedIDs(); 
         S32 pos = mFriendsList->getScrollPos(); 
@@ -465,14 +440,49 @@ void LLPanelFriends::refreshNames(U32 changed_mask)
 
         BOOL have_names = TRUE;
 
-        if(changed_mask & (LLFriendObserver::ADD | LLFriendObserver::REMOVE))
+        // I hate doing it this way. There's no need for it. I blame LL -- MC
+        if (filter_string.empty())
         {
-                have_names &= refreshNamesSync(all_buddies);
-        }
+                if(changed_mask & (LLFriendObserver::ADD | LLFriendObserver::REMOVE))
+                {
+                        have_names &= refreshNamesSync(all_buddies);
+                }
 
-        if(changed_mask & LLFriendObserver::ONLINE)
+                if(changed_mask & LLFriendObserver::ONLINE)
+                {
+                        have_names &= refreshNamesPresence(all_buddies);
+                }
+        }
+        else
         {
-                have_names &= refreshNamesPresence(all_buddies);
+                std::string firstname;
+                std::string lastname;
+                utf8str_tolower(filter_string);
+                LLAvatarTracker::buddy_map_t temp_buddies;
+
+                for (LLAvatarTracker::buddy_map_t::reverse_iterator bIt = all_buddies.rbegin();
+                         bIt != all_buddies.rend(); ++bIt)
+                {
+                        llinfos << (*bIt).first << llendl;
+                        if (gCacheName->getName((*bIt).first, firstname, lastname))
+                        {
+                                std::string test_name(firstname + " " + lastname);
+                                if ((utf8str_tolower(test_name)).find(filter_string) != std::string::npos)
+                                {
+                                        llinfos << "inserting: " << test_name << " from filter: " << filter_string << llendl;
+                                        temp_buddies.insert(temp_buddies.begin(), *bIt);
+                                }
+                        }
+                }
+                if(changed_mask & (LLFriendObserver::ADD | LLFriendObserver::REMOVE))
+                {
+                        have_names &= refreshNamesSync(temp_buddies);
+                }
+
+                if(changed_mask & LLFriendObserver::ONLINE)
+                {
+                        have_names &= refreshNamesPresence(temp_buddies);
+                }
         }
 
         if (!have_names)
diff --git a/linden/indra/newview/llfloaterfriends.h b/linden/indra/newview/llfloaterfriends.h
index 9a1feba..8206362 100644
--- a/linden/indra/newview/llfloaterfriends.h
+++ b/linden/indra/newview/llfloaterfriends.h
@@ -100,7 +100,7 @@ private:
 
         // protected members
         typedef std::map<LLUUID, S32> rights_map_t;
-        void refreshNames(U32 changed_mask);
+        void refreshNames(U32 changed_mask, const std::string& filter_string);
         void filterContacts(const std::string& search_string);
 
         BOOL refreshNamesSync(const LLAvatarTracker::buddy_map_t & all_buddies);