livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull merge from lindenlab/viewer-acme

meow-7.2.2
Merov Linden 2013-12-11 21:48:21 -08:00
parent 26a6668fb2 88f139594b
commit 6a89cb6f25
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llfloatertwitter.cpp
View File

@ -53,6 +53,7 @@ static LLRegisterPanelClassWrapper<LLTwitterPhotoPanel> t_panel_photo("lltwitter
static LLRegisterPanelClassWrapper<LLTwitterAccountPanel> t_panel_account("lltwitteraccountpanel");
const S32 MAX_POSTCARD_DATASIZE = 1024 * 1024; // one megabyte
const std::string DEFAULT_PHOTO_LOCATION_URL = "http://maps.secondlife.com/";
const std::string DEFAULT_PHOTO_QUERY_PARAMETERS = "?sourceid=slshare_photo&utm_source=twitter&utm_medium=photo&utm_campaign=slshare";
///////////////////////////
@ -271,6 +272,13 @@ void LLTwitterPhotoPanel::sendPhoto()
LLAgentUI::buildSLURL(slurl);
std::string slurl_string = slurl.getSLURLString();
// Use a valid http:// URL if the scheme is secondlife://
LLURI slurl_uri(slurl_string);
if (slurl_uri.scheme() == LLSLURL::SLURL_SECONDLIFE_SCHEME)
{
slurl_string = DEFAULT_PHOTO_LOCATION_URL;
}
// Add query parameters so Google Analytics can track incoming clicks!
slurl_string += DEFAULT_PHOTO_QUERY_PARAMETERS;
@ -281,7 +289,6 @@ void LLTwitterPhotoPanel::sendPhoto()
status = status + " " + slurl_string;
}
// Add the photo if required
bool add_photo = mPhotoCheckbox->getValue().asBoolean();
if (add_photo)