summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2017-04-04 11:16:36 -0700
committerRider Linden <rider@lindenlab.com>2017-04-04 11:16:36 -0700
commitab616aac9a1e68199610ec2c3e53f24ee5bff979 (patch)
treebf1105e43840b5b549ee4d5624c79778de450755
parent20748e4433f97c31da1dd1965f2b56e065a7c07d (diff)
parent49e114748fdb52599aaa141c2006198c48aa083b (diff)
Merged lindenlab/viewer-release into default
-rwxr-xr-x.hgtags1
-rw-r--r--indra/newview/VIEWER_VERSION.txt2
-rw-r--r--indra/newview/llpanelsnapshotpostcard.cpp36
-rw-r--r--indra/newview/llpostcard.cpp4
-rw-r--r--indra/newview/llpostcard.h3
5 files changed, 4 insertions, 42 deletions
diff --git a/.hgtags b/.hgtags
index c813f18b10..47413e0553 100755
--- a/.hgtags
+++ b/.hgtags
@@ -524,3 +524,4 @@ bfbba2244320dc2ae47758cd7edd8fa3b67dc756 4.1.2-release
b41e1e7c7876f7656c505f552b5888b4e478f92b 5.0.0-release
c9ce2295012995e3cf5c57bcffcb4870b94c649f 5.0.1-release
cea1632c002c065985ebea15eeeb4aac90f50545 5.0.2-release
+02c24e9f4f7d8aa0de75f27817dda098582f4936 5.0.3-release
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 50e2274e6d..2d6c0bcf19 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-5.0.3
+5.0.4
diff --git a/indra/newview/llpanelsnapshotpostcard.cpp b/indra/newview/llpanelsnapshotpostcard.cpp
index be8bde09f8..ebf9153da9 100644
--- a/indra/newview/llpanelsnapshotpostcard.cpp
+++ b/indra/newview/llpanelsnapshotpostcard.cpp
@@ -57,7 +57,6 @@ public:
LLPanelSnapshotPostcard();
/*virtual*/ BOOL postBuild();
/*virtual*/ void onOpen(const LLSD& key);
- /*virtual*/ S32 notify(const LLSD& info);
private:
/*virtual*/ std::string getWidthSpinnerName() const { return "postcard_snapshot_width"; }
@@ -79,7 +78,6 @@ private:
void onSend();
bool mHasFirstMsgFocus;
- std::string mAgentEmail;
};
static LLPanelInjector<LLPanelSnapshotPostcard> panel_class("llpanelsnapshotpostcard");
@@ -108,37 +106,10 @@ BOOL LLPanelSnapshotPostcard::postBuild()
// virtual
void LLPanelSnapshotPostcard::onOpen(const LLSD& key)
{
- // pick up the user's up-to-date email address
- if (mAgentEmail.empty())
- {
- gAgent.sendAgentUserInfoRequest();
-
- std::string name_string;
- LLAgentUI::buildFullname(name_string);
- getChild<LLUICtrl>("name_form")->setValue(LLSD(name_string));
- }
-
LLPanelSnapshot::onOpen(key);
}
// virtual
-S32 LLPanelSnapshotPostcard::notify(const LLSD& info)
-{
- if (!info.has("agent-email"))
- {
- llassert(info.has("agent-email"));
- return 0;
- }
-
- if (mAgentEmail.empty())
- {
- mAgentEmail = info["agent-email"].asString();
- }
-
- return 1;
-}
-
-// virtual
void LLPanelSnapshotPostcard::updateControls(const LLSD& info)
{
getChild<LLUICtrl>("image_quality_slider")->setValue(gSavedSettings.getS32("SnapshotQuality"));
@@ -190,7 +161,6 @@ void LLPanelSnapshotPostcard::sendPostcard()
if (!url.empty())
{
LLResourceUploadInfo::ptr_t uploadInfo(new LLPostcardUploadInfo(
- mAgentEmail,
getChild<LLUICtrl>("name_form")->getValue().asString(),
getChild<LLUICtrl>("to_form")->getValue().asString(),
getChild<LLUICtrl>("subject_form")->getValue().asString(),
@@ -253,12 +223,6 @@ void LLPanelSnapshotPostcard::onSend()
return;
}
- if (mAgentEmail.empty() || !boost::regex_match(mAgentEmail, email_format))
- {
- LLNotificationsUtil::add("PromptSelfEmail");
- return;
- }
-
std::string subject(getChild<LLUICtrl>("subject_form")->getValue().asString());
if(subject.empty() || !mHasFirstMsgFocus)
{
diff --git a/indra/newview/llpostcard.cpp b/indra/newview/llpostcard.cpp
index 2e639b56eb..d5775042c1 100644
--- a/indra/newview/llpostcard.cpp
+++ b/indra/newview/llpostcard.cpp
@@ -40,11 +40,10 @@
///////////////////////////////////////////////////////////////////////////////
-LLPostcardUploadInfo::LLPostcardUploadInfo(std::string emailFrom, std::string nameFrom, std::string emailTo,
+LLPostcardUploadInfo::LLPostcardUploadInfo(std::string nameFrom, std::string emailTo,
std::string subject, std::string message, LLVector3d globalPosition,
LLPointer<LLImageFormatted> image, invnUploadFinish_f finish) :
LLBufferedAssetUploadInfo(LLUUID::null, image, finish),
- mEmailFrom(emailFrom),
mNameFrom(nameFrom),
mEmailTo(emailTo),
mSubject(subject),
@@ -58,7 +57,6 @@ LLSD LLPostcardUploadInfo::generatePostBody()
LLSD postcard = LLSD::emptyMap();
postcard["pos-global"] = mGlobalPosition.getValue();
postcard["to"] = mEmailTo;
- postcard["from"] = mEmailFrom;
postcard["name"] = mNameFrom;
postcard["subject"] = mSubject;
postcard["msg"] = mMessage;
diff --git a/indra/newview/llpostcard.h b/indra/newview/llpostcard.h
index 24157be636..1e932ae03f 100644
--- a/indra/newview/llpostcard.h
+++ b/indra/newview/llpostcard.h
@@ -53,13 +53,12 @@ private:
class LLPostcardUploadInfo : public LLBufferedAssetUploadInfo
{
public:
- LLPostcardUploadInfo(std::string emailFrom, std::string nameFrom, std::string emailTo,
+ LLPostcardUploadInfo(std::string nameFrom, std::string emailTo,
std::string subject, std::string message, LLVector3d globalPosition,
LLPointer<LLImageFormatted> image, invnUploadFinish_f finish);
virtual LLSD generatePostBody();
private:
- std::string mEmailFrom;
std::string mNameFrom;
std::string mEmailTo;
std::string mSubject;