summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpeople.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llpanelpeople.h')
-rw-r--r--indra/newview/llpanelpeople.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h
index f38c71e0b2..768ba1ef49 100644
--- a/indra/newview/llpanelpeople.h
+++ b/indra/newview/llpanelpeople.h
@@ -50,12 +50,12 @@ public:
LLPanelPeople();
virtual ~LLPanelPeople();
- /*virtual*/ BOOL postBuild();
- /*virtual*/ void onOpen(const LLSD& key);
- /*virtual*/ bool notifyChildren(const LLSD& info);
+ bool postBuild() override;
+ void onOpen(const LLSD& key) override;
+ bool notifyChildren(const LLSD& info) override;
// Implements LLVoiceClientStatusObserver::onChange() to enable call buttons
// when voice is available
- /*virtual*/ void onChange(EStatusType status, const std::string &channelURI, bool proximal);
+ void onChange(EStatusType status, const LLSD& channelInfo, bool proximal) override;
// internals
class Updater;
@@ -87,7 +87,6 @@ private:
std::string getActiveTabName() const;
LLUUID getCurrentItemID() const;
void getCurrentItemIDs(uuid_vec_t& selected_uuids) const;
- void showGroupMenu(LLMenuGL* menu);
void setSortOrder(LLAvatarList* list, ESortOrder order, bool save = true);
// UI callbacks
@@ -148,6 +147,11 @@ private:
Updater* mRecentListUpdater;
Updater* mButtonsUpdater;
LLHandle< LLFloater > mPicker;
+
+ boost::signals2::connection mNearbyFilterCommitConnection;
+ boost::signals2::connection mFriedsFilterCommitConnection;
+ boost::signals2::connection mGroupsFilterCommitConnection;
+ boost::signals2::connection mRecentFilterCommitConnection;
};
#endif //LL_LLPANELPEOPLE_H