diff options
| author | Cho <cho@lindenlab.com> | 2013-11-26 01:47:37 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-11-26 01:47:37 +0000 |
| commit | bf86275d78b041faffc646195bc16ecabaa3bdb7 (patch) | |
| tree | 214948b9f47a1306b96c41f3456b4cafd9054dcc /indra | |
| parent | 08e0b94ff043b77d96609d9d8f395c0acf2640d0 (diff) | |
LLTwitterConnect and LLFlickrConnect now use caps again, instead of pdp15
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llflickrconnect.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/lltwitterconnect.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llflickrconnect.cpp b/indra/newview/llflickrconnect.cpp index 3da3ef22b2..3a21933b63 100644 --- a/indra/newview/llflickrconnect.cpp +++ b/indra/newview/llflickrconnect.cpp @@ -296,8 +296,8 @@ std::string LLFlickrConnect::getFlickrConnectURL(const std::string& route, bool LLViewerRegion *regionp = gAgent.getRegion(); if (regionp) { - url = "http://pdp15.lindenlab.com/flickr/agent/" + gAgentID.asString(); // TEMPORARY FOR TESTING - CHO - //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) diff --git a/indra/newview/lltwitterconnect.cpp b/indra/newview/lltwitterconnect.cpp index fe45d3e4d0..e015867df2 100644 --- a/indra/newview/lltwitterconnect.cpp +++ b/indra/newview/lltwitterconnect.cpp @@ -296,8 +296,8 @@ std::string LLTwitterConnect::getTwitterConnectURL(const std::string& route, boo LLViewerRegion *regionp = gAgent.getRegion(); if (regionp) { - url = "http://pdp15.lindenlab.com/twitter/agent/" + gAgentID.asString(); // TEMPORARY FOR TESTING - CHO - //url = regionp->getCapability("TwitterConnect"); + //url = "http://pdp15.lindenlab.com/twitter/agent/" + gAgentID.asString(); // TEMPORARY FOR TESTING - CHO + url = regionp->getCapability("TwitterConnect"); url += route; if (include_read_from_master && mReadFromMaster) |