diff options
| author | Cho <cho@lindenlab.com> | 2013-11-02 01:50:17 +0100 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-11-02 01:50:17 +0100 |
| commit | 0e71fb3c9d82bf2a307431f68f8ec84d223a4887 (patch) | |
| tree | a6b8291a742154f60cafd8e484ebc3a67fde9987 /indra/newview/llflickrconnect.cpp | |
| parent | 963c97f64a4d1490fe8380805c4de38598adddad (diff) | |
added Flickr floater for ACME-1136, ACME-1137, ACME-1138, ACME-1140, and ACME-1141
Diffstat (limited to 'indra/newview/llflickrconnect.cpp')
| -rw-r--r-- | indra/newview/llflickrconnect.cpp | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/indra/newview/llflickrconnect.cpp b/indra/newview/llflickrconnect.cpp index ba9be3af24..62c8110ea7 100644 --- a/indra/newview/llflickrconnect.cpp +++ b/indra/newview/llflickrconnect.cpp @@ -67,39 +67,6 @@ void toast_user_for_flickr_success() /////////////////////////////////////////////////////////////////////////////// // -class LLFlickrConnectHandler : public LLCommandHandler -{ -public: - LLFlickrConnectHandler() : LLCommandHandler("fbc", UNTRUSTED_THROTTLE) { } - - bool handle(const LLSD& tokens, const LLSD& query_map, LLMediaCtrl* web) - { - if (tokens.size() >= 2) - { - if (tokens[0].asString() == "connect" && tokens[1].asString() == "flickr") - { - // this command probably came from the fbc_web browser, so close it - LLFloater* fbc_web = LLFloaterReg::getInstance("fbc_web"); - if (fbc_web) - { - fbc_web->closeFloater(); - } - - // connect to flickr - if (query_map.has("oauth_token")) - { - LLFlickrConnect::instance().connectToFlickr(query_map["oauth_token"], query_map.get("oauth_verifier")); - } - return true; - } - } - return false; - } -}; -LLFlickrConnectHandler gFlickrConnectHandler; - -/////////////////////////////////////////////////////////////////////////////// -// class LLFlickrConnectResponder : public LLHTTPClient::Responder { LOG_CLASS(LLFlickrConnectResponder); @@ -329,7 +296,8 @@ std::string LLFlickrConnect::getFlickrConnectURL(const std::string& route, bool LLViewerRegion *regionp = gAgent.getRegion(); if (regionp) { - url = regionp->getCapability("FlickrConnect"); + url = "http://pdp15.lindenlab.com/flickr/agent/" + gAgentID.asString(); // TEMPORARY FOR TESTING - CHO + //url = regionp->getCapability("FlickrConnect"); url += route; if (include_read_from_master && mReadFromMaster) |