summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpeople.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llpanelpeople.cpp')
-rw-r--r--indra/newview/llpanelpeople.cpp304
1 files changed, 55 insertions, 249 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 2bdfdf6687..542597f98b 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -54,8 +54,8 @@
#include "llcallingcard.h" // for LLAvatarTracker
#include "llcallbacklist.h"
#include "llerror.h"
+#include "llfacebookconnect.h"
#include "llfloateravatarpicker.h"
-//#include "llfloaterminiinspector.h"
#include "llfriendcard.h"
#include "llgroupactions.h"
#include "llgrouplist.h"
@@ -76,7 +76,6 @@
#include "llspeakers.h"
#include "llfloaterwebcontent.h"
#include "llurlaction.h"
-#include "llcommandhandler.h"
#define FRIEND_LIST_UPDATE_TIMEOUT 0.5
#define NEARBY_LIST_UPDATE_INTERVAL 1
@@ -91,35 +90,6 @@ static const std::string FBCTEST_TAB_NAME = "fbctest_panel";
static const std::string FBCTESTTWO_TAB_NAME = "fbctesttwo_panel";
static const std::string COLLAPSED_BY_USER = "collapsed_by_user";
-class LLFacebookConnectHandler : public LLCommandHandler
-{
-public:
- LLFacebookConnectHandler() : LLCommandHandler("fbc", UNTRUSTED_THROTTLE), mPanelPeople(NULL) { }
-
- LLPanelPeople* mPanelPeople;
-
- bool handle(const LLSD& tokens, const LLSD& query_map,
- LLMediaCtrl* web)
- {
- if (tokens.size() > 0)
- {
- if (tokens[0].asString() == "connect")
- {
- if (query_map.has("code"))
- {
- if (mPanelPeople)
- {
- mPanelPeople->connectToFacebook(query_map["code"]);
- mPanelPeople = NULL;
- }
- }
- return true;
- }
- }
- return false;
- }
-};
-LLFacebookConnectHandler gFacebookConnectHandler;
/** Comparator for comparing avatar items by last interaction date */
class LLAvatarItemRecentComparator : public LLAvatarItemComparator
@@ -577,7 +547,6 @@ private:
LLPanelPeople::LLPanelPeople()
: LLPanel(),
- mConnectedToFbc(false),
mPersonFolderView(NULL),
mTryToConnectToFbc(true),
mTabContainer(NULL),
@@ -586,12 +555,13 @@ LLPanelPeople::LLPanelPeople()
mNearbyList(NULL),
mRecentList(NULL),
mGroupList(NULL),
- mMiniMap(NULL)
+ mMiniMap(NULL),
+ mFacebookListGeneration(0)
{
mFriendListUpdater = new LLFriendListUpdater(boost::bind(&LLPanelPeople::updateFriendList, this));
mNearbyListUpdater = new LLNearbyListUpdater(boost::bind(&LLPanelPeople::updateNearbyList, this));
mRecentListUpdater = new LLRecentListUpdater(boost::bind(&LLPanelPeople::updateRecentList, this));
- mFbcTestListUpdater = new LLFbcTestListUpdater(boost::bind(&LLPanelPeople::updateFbcTestList, this));
+ mFacebookListUpdater = new LLFbcTestListUpdater(boost::bind(&LLPanelPeople::updateFacebookList, this));
mButtonsUpdater = new LLButtonsUpdater(boost::bind(&LLPanelPeople::updateButtons, this));
mCommitCallbackRegistrar.add("People.loginFBC", boost::bind(&LLPanelPeople::onLoginFbcButtonClicked, this));
@@ -626,7 +596,7 @@ LLPanelPeople::~LLPanelPeople()
delete mNearbyListUpdater;
delete mFriendListUpdater;
delete mRecentListUpdater;
- delete mFbcTestListUpdater;
+ delete mFacebookListUpdater;
if(LLVoiceClient::instanceExists())
{
@@ -714,13 +684,17 @@ BOOL LLPanelPeople::postBuild()
mAllFriendList->setContextMenu(&LLPanelPeopleMenus::gPeopleContextMenu);
mOnlineFriendList->setContextMenu(&LLPanelPeopleMenus::gPeopleContextMenu);
+ //===Temporary ========================================================================
+
LLPanel * social_tab = getChild<LLPanel>(FBCTEST_TAB_NAME);
mFacebookFriends = social_tab->getChild<LLSocialList>("facebook_friends");
- social_tab->setVisibleCallback(boost::bind(&Updater::setActive, mFbcTestListUpdater, _2));
+ // Note: we use the same updater for both test lists (brute force but OK since it's temporary)
+ social_tab->setVisibleCallback(boost::bind(&Updater::setActive, mFacebookListUpdater, _2));
//===Test START========================================================================
LLPanel * socialtwo_tab = getChild<LLPanel>(FBCTESTTWO_TAB_NAME);
+ socialtwo_tab->setVisibleCallback(boost::bind(&Updater::setActive, mFacebookListUpdater, _2));
//Create folder view
LLPersonModelCommon* base_item = new LLPersonModelCommon(mPersonFolderViewModel);
@@ -943,19 +917,56 @@ void LLPanelPeople::updateRecentList()
mRecentList->setDirty();
}
-void LLPanelPeople::updateFbcTestList()
+void LLPanelPeople::updateFacebookList()
{
if (mTryToConnectToFbc)
{
// try to reconnect to facebook!
- tryToReconnectToFacebook();
+ LLFacebookConnect::instance().tryToReconnectToFacebook();
// don't try again
mTryToConnectToFbc = false;
// stop updating
- mFbcTestListUpdater->setActive(false);
+ mFacebookListUpdater->setActive(false);
}
+
+ if (LLFacebookConnect::instance().generation() != mFacebookListGeneration)
+ {
+ mFacebookListGeneration = LLFacebookConnect::instance().generation();
+ LLSD friends = LLFacebookConnect::instance().getContent();
+
+ mFacebookFriends->clear();
+ LLPersonTabModel::tab_type tab_type;
+ LLAvatarTracker& avatar_tracker = LLAvatarTracker::instance();
+
+ for (LLSD::map_const_iterator i = friends.beginMap(); i != friends.endMap(); ++i)
+ {
+ std::string name = i->second["name"].asString();
+ LLUUID agent_id = i->second.has("agent_id") ? i->second["agent_id"].asUUID() : LLUUID(NULL);
+
+ //add to avatar list
+ mFacebookFriends->addNewItem(agent_id, name, false);
+
+ //FB+SL but not SL friend
+ if (agent_id.notNull() && !avatar_tracker.isBuddy(agent_id))
+ {
+ tab_type = LLPersonTabModel::FB_SL_NON_SL_FRIEND;
+ }
+ //FB only friend
+ else
+ {
+ tab_type = LLPersonTabModel::FB_ONLY_FRIEND;
+ }
+
+ //Add to person tab model
+ LLPersonTabModel * person_tab_model = dynamic_cast<LLPersonTabModel *>(mPersonFolderView->getPersonTabModelByIndex(tab_type));
+ if (person_tab_model)
+ {
+ addParticipantToModel(person_tab_model, agent_id, name);
+ }
+ }
+ }
}
void LLPanelPeople::updateButtons()
@@ -1634,45 +1645,12 @@ bool LLPanelPeople::isAccordionCollapsedByUser(const std::string& name)
return isAccordionCollapsedByUser(getChild<LLUICtrl>(name));
}
+/*
void LLPanelPeople::openFacebookWeb(std::string url)
{
- gFacebookConnectHandler.mPanelPeople = this;
LLUrlAction::openURLExternal(url);
}
-
-void LLPanelPeople::showFacebookFriends(const LLSD& friends)
-{
- mFacebookFriends->clear();
- LLPersonTabModel::tab_type tab_type;
- LLAvatarTracker& avatar_tracker = LLAvatarTracker::instance();
-
- for (LLSD::map_const_iterator i = friends.beginMap(); i != friends.endMap(); ++i)
- {
- std::string name = i->second["name"].asString();
- LLUUID agent_id = i->second.has("agent_id") ? i->second["agent_id"].asUUID() : LLUUID(NULL);
-
- //add to avatar list
- mFacebookFriends->addNewItem(agent_id, name, false);
-
- //FB+SL but not SL friend
- if(agent_id.notNull() && !avatar_tracker.isBuddy(agent_id))
- {
- tab_type = LLPersonTabModel::FB_SL_NON_SL_FRIEND;
- }
- //FB only friend
- else
- {
- tab_type = LLPersonTabModel::FB_ONLY_FRIEND;
- }
-
- //Add to person tab model
- LLPersonTabModel * person_tab_model = dynamic_cast<LLPersonTabModel *>(mPersonFolderView->getPersonTabModelByIndex(tab_type));
- if(person_tab_model)
- {
- addParticipantToModel(person_tab_model, agent_id, name);
- }
- }
-}
+*/
void LLPanelPeople::addTestParticipant()
{
@@ -1730,187 +1708,15 @@ void LLPanelPeople::addParticipantToModel(LLPersonTabModel * person_folder_model
person_folder_model->addParticipant(person_model);
}
-void LLPanelPeople::hideFacebookFriends()
-{
- mFacebookFriends->clear();
-}
-
-class FacebookConnectResponder : public LLHTTPClient::Responder
-{
-public:
-
- LLPanelPeople * mPanelPeople;
-
- FacebookConnectResponder(LLPanelPeople * panel_people) : mPanelPeople(panel_people) {}
-
- /*virtual*/ void completed(U32 status, const std::string& reason, const LLSD& content)
- {
- if (isGoodStatus(status))
- {
- llinfos << content << llendl;
-
- // grab some graph data now that we are connected
- mPanelPeople->mConnectedToFbc = true;
- mPanelPeople->loadFacebookFriends();
- }
- else
- {
- llinfos << "failed to get response. reason: " << reason << " status: " << status << llendl;
- }
- }
-
- /*virtual*/ void completedHeader(U32 status, const std::string& reason, const LLSD& content)
- {
- if (status == 302)
- {
- mPanelPeople->openFacebookWeb(content["location"]);
- }
- }
-};
-
-class FacebookDisconnectResponder : public LLHTTPClient::Responder
-{
-public:
-
- LLPanelPeople * mPanelPeople;
-
- FacebookDisconnectResponder(LLPanelPeople * panel_people) : mPanelPeople(panel_people) {}
-
- /*virtual*/ void completed(U32 status, const std::string& reason, const LLSD& content)
- {
- if (isGoodStatus(status))
- {
- llinfos << content << llendl;
-
- // hide all the facebook stuff
- mPanelPeople->mConnectedToFbc = false;
- mPanelPeople->hideFacebookFriends();
- }
- else
- {
- llinfos << "failed to get response. reason: " << reason << " status: " << status << llendl;
- }
- }
-};
-
-class FacebookConnectedResponder : public LLHTTPClient::Responder
-{
-public:
-
- LLPanelPeople * mPanelPeople;
- bool mShowLoginIfNotConnected;
-
- FacebookConnectedResponder(LLPanelPeople * panel_people, bool show_login_if_not_connected) : mPanelPeople(panel_people), mShowLoginIfNotConnected(show_login_if_not_connected) {}
-
- /*virtual*/ void completed(U32 status, const std::string& reason, const LLSD& content)
- {
- if (isGoodStatus(status))
- {
- llinfos << content << llendl;
-
- // grab some graph data if already connected
- mPanelPeople->mConnectedToFbc = true;
- mPanelPeople->loadFacebookFriends();
- }
- else
- {
- llinfos << "failed to get response. reason: " << reason << " status: " << status << llendl;
-
- // show the facebook login page if not connected yet
- if (status == 404 && mShowLoginIfNotConnected)
- {
- mPanelPeople->connectToFacebook();
- }
- }
- }
-};
-
-class FacebookFriendsResponder : public LLHTTPClient::Responder
-{
-public:
-
- LLPanelPeople * mPanelPeople;
-
- FacebookFriendsResponder(LLPanelPeople * panel_people) : mPanelPeople(panel_people) {}
-
- /*virtual*/ void completed(U32 status, const std::string& reason, const LLSD& content)
- {
- if (isGoodStatus(status))
- {
- llinfos << content << llendl;
-
- // display the list of friends
- mPanelPeople->showFacebookFriends(content);
- }
- else
- {
- llinfos << "failed to get response. reason: " << reason << " status: " << status << llendl;
- }
- }
-
- /*virtual*/ void completedHeader(U32 status, const std::string& reason, const LLSD& content)
- {
- if (status == 302)
- {
- mPanelPeople->openFacebookWeb(content["location"]);
- }
- }
-};
-
-void LLPanelPeople::loadFacebookFriends()
-{
- const bool follow_redirects=false;
- const F32 timeout=HTTP_REQUEST_EXPIRY_SECS;
- LLHTTPClient::get(getFacebookConnectURL("/friend"), new FacebookFriendsResponder(this),
- LLSD(), timeout, follow_redirects);
-}
-
-void LLPanelPeople::tryToReconnectToFacebook()
-{
- if (!mConnectedToFbc)
- {
- const bool follow_redirects=false;
- const F32 timeout=HTTP_REQUEST_EXPIRY_SECS;
- LLHTTPClient::get(getFacebookConnectURL("/connection"), new FacebookConnectedResponder(this, false),
- LLSD(), timeout, follow_redirects);
- }
-}
-
-void LLPanelPeople::connectToFacebook(const std::string& auth_code)
-{
- LLSD body;
- if (!auth_code.empty())
- body["code"] = auth_code;
-
- LLHTTPClient::put(getFacebookConnectURL("/connection"), body, new FacebookConnectResponder(this));
-}
-
-void LLPanelPeople::disconnectFromFacebook()
-{
- LLHTTPClient::del(getFacebookConnectURL("/connection"), new FacebookDisconnectResponder(this));
-}
-
-std::string LLPanelPeople::getFacebookConnectURL(const std::string& route)
-{
- //static std::string sFacebookConnectUrl = gAgent.getRegion()->getCapability("FacebookConnect");
- static std::string sFacebookConnectUrl = "https://pdp15.lindenlab.com/fbc/agent/" + gAgentID.asString(); // TEMPORARY HACK FOR FB DEMO - Cho
- std::string url = sFacebookConnectUrl + route;
- llinfos << url << llendl;
- return url;
-}
-
void LLPanelPeople::onLoginFbcButtonClicked()
{
- if (mConnectedToFbc)
+ if (LLFacebookConnect::instance().getConnected())
{
- disconnectFromFacebook();
+ LLFacebookConnect::instance().disconnectFromFacebook();
}
else
{
- const bool follow_redirects=false;
- const F32 timeout=HTTP_REQUEST_EXPIRY_SECS;
- LLHTTPClient::get(getFacebookConnectURL("/connection"), new FacebookConnectedResponder(this, true),
- LLSD(), timeout, follow_redirects);
+ LLFacebookConnect::instance().getConnectionToFacebook();
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-22 14:51:59 +0000