summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-04-02 20:11:20 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2013-04-02 20:11:20 -0700
commit2ab6a73c21b5bab7ec75bcc0723fe3a52de8571f (patch)
tree6fa6ba940c4720e5eeccd481fe238fae735dfa46 /indra
parent859f7b5484df50bb45e10c8d73517205328b6b9c (diff)
parentd9a143518f8e4c164c5a536de829c9cbd58e0e2c (diff)
merge
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llpanelpeople.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index cbc5eba65f..f55459afec 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -80,6 +80,7 @@ static const std::string FBCTEST_TAB_NAME = "fbctest_panel";
static const std::string COLLAPSED_BY_USER = "collapsed_by_user";
static const std::string FBC_SERVICES_URL = "https://pdp15.lindenlab.com";
+static const std::string FBC_SERVICES_REDIRECT_URI = "https://pdp15.lindenlab.com/";
/** Comparator for comparing avatar items by last interaction date */
class LLAvatarItemRecentComparator : public LLAvatarItemComparator
@@ -1769,7 +1770,7 @@ public:
else if (mShowLoginIfNotConnected)
{
LLFloaterWebContent::Params p;
- p.url("https://www.facebook.com/dialog/oauth?client_id=565771023434202&redirect_uri=" + FBC_SERVICES_URL + "/");
+ p.url("https://www.facebook.com/dialog/oauth?client_id=565771023434202&redirect_uri=" + FBC_SERVICES_REDIRECT_URI);
mPanelPeople->openFacebookWeb(p);
}
}
@@ -1818,8 +1819,10 @@ void LLPanelPeople::loadFacebookFriends()
void LLPanelPeople::connectToFacebook(const std::string& auth_code)
{
- llinfos << "attempting to connect to facebook with code " << auth_code << llendl;
- LLHTTPClient::post(FBC_SERVICES_URL + "/agent/" + gAgentID.asString() + "/fbc/connect/" + auth_code, LLSD(), new FacebookConnectResponder(this));
+ LLSD body;
+ body["code"] = auth_code;
+ body["redirect_uri"] = FBC_SERVICES_REDIRECT_URI;
+ LLHTTPClient::post(FBC_SERVICES_URL + "/agent/" + gAgentID.asString() + "/fbc/connect", body, new FacebookConnectResponder(this));
}
void LLPanelPeople::disconnectFromFacebook()