From 377dd51688dea6bd83f0a9b70be12528f8a891c3 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Wed, 13 Nov 2013 20:32:06 +0000
Subject: [PATCH] added fancier link description text and switched back to
using dev servers instead of caps for Flickr and Twitter
---
indra/newview/llflickrconnect.cpp | 4 ++--
indra/newview/llfloaterflickr.cpp | 3 ++-
indra/newview/lltwitterconnect.cpp | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/indra/newview/llflickrconnect.cpp b/indra/newview/llflickrconnect.cpp
index 3a21933b635..3da3ef22b2c 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/llfloaterflickr.cpp b/indra/newview/llfloaterflickr.cpp
index 0bfbd02a045..5a05c474164 100644
--- a/indra/newview/llfloaterflickr.cpp
+++ b/indra/newview/llfloaterflickr.cpp
@@ -53,6 +53,7 @@ static LLRegisterPanelClassWrapper<LLFlickrAccountPanel> t_panel_account("llflic
const S32 MAX_POSTCARD_DATASIZE = 1024 * 1024; // one megabyte
const std::string DEFAULT_PHOTO_QUERY_PARAMETERS = "?sourceid=slshare_photo&utm_source=flickr&utm_medium=photo&utm_campaign=slshare";
+const std::string DEFAULT_PHOTO_LINK_TEXT = "VISIT THIS LOCATION NOW";
///////////////////////////
//LLFlickrPhotoPanel///////
@@ -261,7 +262,7 @@ void LLFlickrPhotoPanel::sendPhoto()
// Add query parameters so Google Analytics can track incoming clicks!
slurl_string += DEFAULT_PHOTO_QUERY_PARAMETERS;
- slurl_string = "<a href=\"" + slurl_string + "\">VISIT THIS LOCATION</a>";
+ slurl_string = "<a href=\"" + slurl_string + "\">" + DEFAULT_PHOTO_LINK_TEXT + "</a>";
// Add it to the description (pretty crude, but we don't have a better option with photos)
if (description.empty())
diff --git a/indra/newview/lltwitterconnect.cpp b/indra/newview/lltwitterconnect.cpp
index e015867df2b..fe45d3e4d0f 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)
--
GitLab