summaryrefslogtreecommitdiff
path: root/indra/newview/llflickrconnect.cpp
diff options
context:
space:
mode:
authorCho <cho@lindenlab.com>2013-11-13 20:32:06 +0000
committerCho <cho@lindenlab.com>2013-11-13 20:32:06 +0000
commit377dd51688dea6bd83f0a9b70be12528f8a891c3 (patch)
tree7d7d17166363e370b12f36dd999fe719dee0a135 /indra/newview/llflickrconnect.cpp
parent47918f4537ee924c4cb9652a72561b5febbddeb6 (diff)
added fancier link description text and switched back to using dev servers instead of caps for Flickr and Twitter
Diffstat (limited to 'indra/newview/llflickrconnect.cpp')
-rw-r--r--indra/newview/llflickrconnect.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llflickrconnect.cpp b/indra/newview/llflickrconnect.cpp
index 3a21933b63..3da3ef22b2 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)