summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorCho <cho@lindenlab.com>2013-04-09 01:15:00 +0100
committerCho <cho@lindenlab.com>2013-04-09 01:15:00 +0100
commitc8883f6a5245056c4f26f2ce4f874549e62b2b29 (patch)
treee7514c12e7200b4985be6ae2fdd8e912b84db320 /indra/newview
parent2465634bf77b7c471106855c347b611bcd8ef2ab (diff)
updated to use new API routes
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpanelpeople.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 29a92525de..052637742b 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -888,6 +888,9 @@ void LLPanelPeople::updateFbcTestList()
// close the browser window
mFbcTestBrowserHandle.get()->die();
+
+ // get rid of the handle
+ mFbcTestBrowserHandle = LLHandle<LLFloater>();
// stop updating
mFbcTestListUpdater->setActive(false);
@@ -1716,7 +1719,7 @@ public:
llinfos << content << llendl;
// display the list of friends
- if (content.has("friends"))
+ if (content.has("friends") && !content.has("error"))
{
mPanelPeople->showFacebookFriends(content["friends"]);
}
@@ -1748,14 +1751,17 @@ void LLPanelPeople::tryToReconnectToFacebook()
void LLPanelPeople::connectToFacebook(const std::string& auth_code)
{
LLSD body;
+ body["agent_id"] = gAgentID.asString();
body["code"] = auth_code;
body["redirect_uri"] = FBC_SERVICES_REDIRECT_URI;
- LLHTTPClient::post(FBC_SERVICES_URL + "/agent/" + gAgentID.asString() + "/fbc", body, new FacebookConnectResponder(this));
+ LLHTTPClient::post(FBC_SERVICES_URL + "/agent/" + gAgentID.asString() + "/fbc/connect", body, new FacebookConnectResponder(this));
}
void LLPanelPeople::disconnectFromFacebook()
{
- LLHTTPClient::del(FBC_SERVICES_URL + "/agent/" + gAgentID.asString() + "/fbc", new FacebookDisconnectResponder(this));
+ LLSD body;
+ body["agent_id"] = gAgentID.asString();
+ LLHTTPClient::post(FBC_SERVICES_URL + "/agent/" + gAgentID.asString() + "/fbc/disconnect", body, new FacebookDisconnectResponder(this));
}
void LLPanelPeople::onLoginFbcButtonClicked()