merge of latest viewer/viewer-20

1 files changed, 10 insertions, 24 deletions

diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h
index c0c2f70614..de27814388 100644
--- a/indra/newview/llpanelpeople.h
+++ b/indra/newview/llpanelpeople.h
@@ -40,7 +40,6 @@
 class LLFilterEditor;
 class LLTabContainer;
 class LLAvatarList;
-class LLAvatarListTmp;
 class LLGroupList;
 
 class LLPanelPeople : public LLPanel
@@ -59,14 +58,10 @@ public:
 
 private:
 	// methods indirectly called by the updaters
-	bool					updateFriendList(U32 changed_mask);
-	bool					updateNearbyList();
-	bool					updateRecentList();
-	bool					updateGroupList();
-
-	bool					filterFriendList();
-	bool					filterNearbyList();
-	bool					filterRecentList();
+	void					updateFriendList();
+	void					updateNearbyList();
+	void					updateRecentList();
+
 	void					updateButtons();
 	const std::string&		getActiveTabName() const;
 	LLUUID					getCurrentItemID() const;
@@ -97,6 +92,7 @@ private:
 	void					onRecentViewSortButtonClicked();
 	void					onNearbyViewSortButtonClicked();
 	void					onFriendsViewSortButtonClicked();
+	void					onGroupsViewSortButtonClicked();
 	void					onAvatarListDoubleClicked(LLAvatarList* list);
 	void					onAvatarListCommitted(LLAvatarList* list);
 	void					onGroupPlusButtonClicked();
@@ -105,46 +101,36 @@ private:
 
 	void					onFriendsViewSortMenuItemClicked(const LLSD& userdata);
 	void					onNearbyViewSortMenuItemClicked(const LLSD& userdata);
+	void					onGroupsViewSortMenuItemClicked(const LLSD& userdata);
 	void					onRecentViewSortMenuItemClicked(const LLSD& userdata);
 
 	// misc callbacks
-	bool					onFriendListUpdate(U32 changed_mask);
 	static void				onAvatarPicked(
 								const std::vector<std::string>& names,
 								const std::vector<LLUUID>& ids,
 								void*);
 
+	void					onFriendsAccordionExpandedCollapsed(const LLSD& param, LLAvatarList* avatar_list);
+
 	LLFilterEditor*			mFilterEditor;
 	LLTabContainer*			mTabContainer;
 	LLAvatarList*			mOnlineFriendList;
 	LLAvatarList*			mAllFriendList;
 	LLAvatarList*			mNearbyList;
-	LLAvatarListTmp*		mRecentList;
+	LLAvatarList*			mRecentList;
 	LLGroupList*			mGroupList;
 
 	LLHandle<LLView>		mGroupPlusMenuHandle;
 	LLHandle<LLView>		mNearbyViewSortMenuHandle;
 	LLHandle<LLView>		mFriendsViewSortMenuHandle;
+	LLHandle<LLView>		mGroupsViewSortMenuHandle;
 	LLHandle<LLView>		mRecentViewSortMenuHandle;
 
 	Updater*				mFriendListUpdater;
 	Updater*				mNearbyListUpdater;
 	Updater*				mRecentListUpdater;
-	Updater*				mGroupListUpdater;
 
 	std::string				mFilterSubString;
-
-	// The vectors below contain up-to date avatar lists
-	// for the corresponding tabs.
-	// When the user enters a filter, it gets applied
-	// to all the vectors and the result is shown in the tabs.
-	// We don't need to have such a vector for the groups tab
-	// since re-fetching the groups list is always fast.
-	typedef std::vector<LLUUID> uuid_vector_t;
-	uuid_vector_t			mNearbyVec;
-	uuid_vector_t			mOnlineFriendVec;
-	uuid_vector_t			mAllFriendVec;
-	uuid_vector_t			mRecentVec;
 };
 
 #endif //LL_LLPANELPEOPLE_H