diff options
| author | Cho <cho@lindenlab.com> | 2014-02-12 19:45:52 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2014-02-12 19:45:52 +0000 |
| commit | bf0f20ef44de89c5852bfcfca29693b2c09f6a9c (patch) | |
| tree | 9c1e761a6a8327ce487c30958a8d5312c1dfb27e /indra/newview/llfloaterflickr.cpp | |
| parent | a5add351e891fb4e49c8014851b1dfff8657ff07 (diff) | |
Changed Flickr link text for ACME-1320
Diffstat (limited to 'indra/newview/llfloaterflickr.cpp')
| -rw-r--r-- | indra/newview/llfloaterflickr.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/llfloaterflickr.cpp b/indra/newview/llfloaterflickr.cpp index 607b5b5df9..61f1487d4b 100644 --- a/indra/newview/llfloaterflickr.cpp +++ b/indra/newview/llfloaterflickr.cpp @@ -48,13 +48,13 @@ #include "llviewercontrol.h" #include "llviewermedia.h" #include "lltabcontainer.h" +#include "llviewerparcelmgr.h" static LLRegisterPanelClassWrapper<LLFlickrPhotoPanel> t_panel_photo("llflickrphotopanel"); static LLRegisterPanelClassWrapper<LLFlickrAccountPanel> t_panel_account("llflickraccountpanel"); 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"; const std::string DEFAULT_TAG_TEXT = "secondlife "; /////////////////////////// @@ -303,7 +303,15 @@ 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 + "\">" + DEFAULT_PHOTO_LINK_TEXT + "</a>"; + std::string photo_link_text = "Visit this location";// at [] in Second Life"; + std::string parcel_name = LLViewerParcelMgr::getInstance()->getAgentParcelName(); + if (!parcel_name.empty()) + { + photo_link_text += " at " + parcel_name; + } + photo_link_text += " in Second Life"; + + slurl_string = "<a href=\"" + slurl_string + "\">" + photo_link_text + "</a>"; // Add it to the description (pretty crude, but we don't have a better option with photos) if (description.empty()) |