diff options
author | Cho <cho@lindenlab.com> | 2013-10-09 00:32:31 +0100 |
---|---|---|
committer | Cho <cho@lindenlab.com> | 2013-10-09 00:32:31 +0100 |
commit | 528f424952ea77945139279c7de4bb67880ce169 (patch) | |
tree | 101bcd8144ffedc960a5b216a7df8210f2a1564f /indra/newview/llfacebookconnect.cpp | |
parent | 98a89748789034a53f129e19d06649d79b384c52 (diff) |
temporarily added test call for FlickrConnect and TwitterConnect for ACME-1014
Diffstat (limited to 'indra/newview/llfacebookconnect.cpp')
-rw-r--r-- | indra/newview/llfacebookconnect.cpp | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp index 611d18d6d6..497354acc7 100644 --- a/indra/newview/llfacebookconnect.cpp +++ b/indra/newview/llfacebookconnect.cpp @@ -366,6 +366,30 @@ std::string LLFacebookConnect::getFacebookConnectURL(const std::string& route, b return url; } +std::string LLFacebookConnect::getFlickrConnectURL(const std::string& route, bool include_read_from_master) +{ + std::string url = gAgent.getRegion()->getCapability("FlickrConnect"); + url += route; + + if (include_read_from_master && mReadFromMaster) + { + url += "?read_from_master=true"; + } + return url; +} + +std::string LLFacebookConnect::getTwitterConnectURL(const std::string& route, bool include_read_from_master) +{ + std::string url = gAgent.getRegion()->getCapability("TwitterConnect"); + url += route; + + if (include_read_from_master && mReadFromMaster) + { + url += "?read_from_master=true"; + } + return url; +} + void LLFacebookConnect::connectToFacebook(const std::string& auth_code, const std::string& auth_state) { LLSD body; @@ -388,6 +412,11 @@ void LLFacebookConnect::checkConnectionToFacebook(bool auto_connect) const F32 timeout = HTTP_REQUEST_EXPIRY_SECS; LLHTTPClient::get(getFacebookConnectURL("/connection", true), new LLFacebookConnectedResponder(auto_connect), LLSD(), timeout, follow_redirects); + + // TEMPORARY FOR TESTING - CHO + llinfos << "FlickrConnect URL: " << getFlickrConnectURL() << LL_ENDL; + llinfos << "TwitterConnect URL: " << getTwitterConnectURL() << LL_ENDL; + } void LLFacebookConnect::loadFacebookInfo() |