merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873 https://svn.aws.productengine.com/secondlife/pe/stable@888 -> viewer-2.0.0-pe-4

1 files changed, 16 insertions, 1 deletions

diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h
index 4d535f287c..4855096750 100644
--- a/indra/newview/llpanelpeople.h
+++ b/indra/newview/llpanelpeople.h
@@ -61,8 +61,10 @@ private:
 	bool					updateNearbyList();
 	bool					updateRecentList();
 	bool					updateGroupList();
+	bool					filterFriendList();
+	bool					filterNearbyList();
+	bool					filterRecentList();
 	void					updateButtons();
-	bool					refreshFriendNames(U32 changed_mask);
 	LLAvatarList*			getActiveAvatarList() const;
 	LLUUID					getCurrentItemID() const;
 	void					buttonSetVisible(std::string btn_name, BOOL visible);
@@ -72,6 +74,8 @@ private:
 
 	/*virtual*/ void		onVisibilityChange(BOOL new_visibility);
 
+	void					reSelectedCurrentTab();
+
 	// UI callbacks
 	void					onSearchEdit(const std::string& search_string);
 	void					onTabSelected(const LLSD& param);
@@ -117,6 +121,17 @@ private:
 	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			mFriendVec;
+	uuid_vector_t			mRecentVec;
 };
 
 #endif //LL_LLPANELPEOPLE_H