diff options
author | Oz Linden <oz@lindenlab.com> | 2010-10-14 14:07:57 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-10-14 14:07:57 -0400 |
commit | a63b83775120f7ebe3bafb897da70e4e41bda6a4 (patch) | |
tree | 9bf6087af7b9b6174ef0498f9dbc46c38f0f7ecc /indra/newview/llpanelpeople.h | |
parent | c322a29752c74c92328ebffeef77faa06e9ca7d9 (diff) | |
parent | 1bd19e8ffe99c4a2d0df8936bf01a63ebc05258f (diff) |
pull late fixes from beta
Diffstat (limited to 'indra/newview/llpanelpeople.h')
-rw-r--r-- | indra/newview/llpanelpeople.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h index 3109feef0c..d0913ee756 100644 --- a/indra/newview/llpanelpeople.h +++ b/indra/newview/llpanelpeople.h @@ -30,7 +30,6 @@ #include <llpanel.h> #include "llcallingcard.h" // for avatar tracker -#include "llmenubutton.h" #include "llvoiceclient.h" class LLFilterEditor; @@ -101,7 +100,10 @@ private: void onShareButtonClicked(); void onMoreButtonClicked(); void onActivateButtonClicked(); - void onViewSortButtonClicked(); + void onRecentViewSortButtonClicked(); + void onNearbyViewSortButtonClicked(); + void onFriendsViewSortButtonClicked(); + void onGroupsViewSortButtonClicked(); void onAvatarListDoubleClicked(LLUICtrl* ctrl); void onAvatarListCommitted(LLAvatarList* list); void onGroupPlusButtonClicked(); @@ -155,11 +157,6 @@ private: Updater* mNearbyListUpdater; Updater* mRecentListUpdater; - LLMenuButton* mNearbyGearButton; - LLMenuButton* mFriendsGearButton; - LLMenuButton* mGroupsGearButton; - LLMenuButton* mRecentGearButton; - std::string mFilterSubString; std::string mFilterSubStringOrig; }; |