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.h18
1 files changed, 5 insertions, 13 deletions
diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h
index 943d84ac1d..6b5514deaf 100644
--- a/indra/newview/llpanelpeople.h
+++ b/indra/newview/llpanelpeople.h
@@ -62,20 +62,11 @@ public:
static void idle(void * user_data);
- void openFacebookWeb(std::string url);
- void showFacebookFriends(const LLSD& friends);
+// void openFacebookWeb(std::string url);
void addTestParticipant();
void addParticipantToModel(LLPersonTabModel * session_model, const LLUUID& agent_id, const std::string& name);
- void hideFacebookFriends();
- void loadFacebookFriends();
- void tryToReconnectToFacebook();
- void connectToFacebook(const std::string& auth_code = "");
- void disconnectFromFacebook();
- std::string getFacebookConnectURL(const std::string& route = "");
-
- bool mConnectedToFbc;
- bool mTryToConnectToFbc;
+ bool mTryToConnectToFbc;
// internals
class Updater;
@@ -97,7 +88,7 @@ private:
void updateFriendList();
void updateNearbyList();
void updateRecentList();
- void updateFbcTestList();
+ void updateFacebookList();
bool isItemsFreeOfFriends(const uuid_vec_t& uuids);
@@ -161,6 +152,7 @@ private:
LLAvatarList* mRecentList;
LLGroupList* mGroupList;
LLSocialList* mFacebookFriends;
+ S32 mFacebookListGeneration;
LLNetMap* mMiniMap;
std::vector<std::string> mSavedOriginalFilters;
@@ -171,7 +163,7 @@ private:
Updater* mFriendListUpdater;
Updater* mNearbyListUpdater;
Updater* mRecentListUpdater;
- Updater* mFbcTestListUpdater;
+ Updater* mFacebookListUpdater;
Updater* mButtonsUpdater;
LLMenuButton* mFBCGearButton;
LLHandle< LLFloater > mPicker;