summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xindra/newview/app_settings/filters/Video.xml22
-rw-r--r--indra/newview/llfloaterflickr.cpp12
2 files changed, 26 insertions, 8 deletions
diff --git a/indra/newview/app_settings/filters/Video.xml b/indra/newview/app_settings/filters/Video.xml
index aa65536235..fe17f3950a 100755
--- a/indra/newview/app_settings/filters/Video.xml
+++ b/indra/newview/app_settings/filters/Video.xml
@@ -9,26 +9,36 @@
</array>
<array>
<string>darken</string>
- <real>0.2</real>
+ <real>0.15</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<array>
<string>stencil</string>
- <string>scanlines</string>
- <string>blend</string>
+ <string>uniform</string>
+ <string>add</string>
<real>0.0</real>
- <real>1.0</real>
+ <real>0.5</real>
+ </array>
+ <array>
+ <string>screen</string>
+ <string>line</string>
<real>0.02</real>
<real>0.0</real>
</array>
<array>
- <string>brighten</string>
- <real>0.2</real>
+ <string>gamma</string>
+ <real>0.25</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
+ <array>
+ <string>blur</string>
+ </array>
+ <array>
+ <string>blur</string>
+ </array>
</array>
</llsd>
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())