Skip to content
Snippets Groups Projects
Commit 6fb4bb4e authored by Brad Payne (Vir Linden)'s avatar Brad Payne (Vir Linden)
Browse files

merge

parents 295c8a43 49e11474
No related branches found
No related tags found
No related merge requests found
...@@ -524,3 +524,4 @@ bfbba2244320dc2ae47758cd7edd8fa3b67dc756 4.1.2-release ...@@ -524,3 +524,4 @@ bfbba2244320dc2ae47758cd7edd8fa3b67dc756 4.1.2-release
b41e1e7c7876f7656c505f552b5888b4e478f92b 5.0.0-release b41e1e7c7876f7656c505f552b5888b4e478f92b 5.0.0-release
c9ce2295012995e3cf5c57bcffcb4870b94c649f 5.0.1-release c9ce2295012995e3cf5c57bcffcb4870b94c649f 5.0.1-release
cea1632c002c065985ebea15eeeb4aac90f50545 5.0.2-release cea1632c002c065985ebea15eeeb4aac90f50545 5.0.2-release
02c24e9f4f7d8aa0de75f27817dda098582f4936 5.0.3-release
5.0.3 5.0.4
...@@ -57,7 +57,6 @@ class LLPanelSnapshotPostcard ...@@ -57,7 +57,6 @@ class LLPanelSnapshotPostcard
LLPanelSnapshotPostcard(); LLPanelSnapshotPostcard();
/*virtual*/ BOOL postBuild(); /*virtual*/ BOOL postBuild();
/*virtual*/ void onOpen(const LLSD& key); /*virtual*/ void onOpen(const LLSD& key);
/*virtual*/ S32 notify(const LLSD& info);
private: private:
/*virtual*/ std::string getWidthSpinnerName() const { return "postcard_snapshot_width"; } /*virtual*/ std::string getWidthSpinnerName() const { return "postcard_snapshot_width"; }
...@@ -79,7 +78,6 @@ class LLPanelSnapshotPostcard ...@@ -79,7 +78,6 @@ class LLPanelSnapshotPostcard
void onSend(); void onSend();
bool mHasFirstMsgFocus; bool mHasFirstMsgFocus;
std::string mAgentEmail;
}; };
static LLPanelInjector<LLPanelSnapshotPostcard> panel_class("llpanelsnapshotpostcard"); static LLPanelInjector<LLPanelSnapshotPostcard> panel_class("llpanelsnapshotpostcard");
...@@ -108,36 +106,9 @@ BOOL LLPanelSnapshotPostcard::postBuild() ...@@ -108,36 +106,9 @@ BOOL LLPanelSnapshotPostcard::postBuild()
// virtual // virtual
void LLPanelSnapshotPostcard::onOpen(const LLSD& key) 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); 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 // virtual
void LLPanelSnapshotPostcard::updateControls(const LLSD& info) void LLPanelSnapshotPostcard::updateControls(const LLSD& info)
{ {
...@@ -190,7 +161,6 @@ void LLPanelSnapshotPostcard::sendPostcard() ...@@ -190,7 +161,6 @@ void LLPanelSnapshotPostcard::sendPostcard()
if (!url.empty()) if (!url.empty())
{ {
LLResourceUploadInfo::ptr_t uploadInfo(new LLPostcardUploadInfo( LLResourceUploadInfo::ptr_t uploadInfo(new LLPostcardUploadInfo(
mAgentEmail,
getChild<LLUICtrl>("name_form")->getValue().asString(), getChild<LLUICtrl>("name_form")->getValue().asString(),
getChild<LLUICtrl>("to_form")->getValue().asString(), getChild<LLUICtrl>("to_form")->getValue().asString(),
getChild<LLUICtrl>("subject_form")->getValue().asString(), getChild<LLUICtrl>("subject_form")->getValue().asString(),
...@@ -253,12 +223,6 @@ void LLPanelSnapshotPostcard::onSend() ...@@ -253,12 +223,6 @@ void LLPanelSnapshotPostcard::onSend()
return; return;
} }
if (mAgentEmail.empty() || !boost::regex_match(mAgentEmail, email_format))
{
LLNotificationsUtil::add("PromptSelfEmail");
return;
}
std::string subject(getChild<LLUICtrl>("subject_form")->getValue().asString()); std::string subject(getChild<LLUICtrl>("subject_form")->getValue().asString());
if(subject.empty() || !mHasFirstMsgFocus) if(subject.empty() || !mHasFirstMsgFocus)
{ {
......
...@@ -40,11 +40,10 @@ ...@@ -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, std::string subject, std::string message, LLVector3d globalPosition,
LLPointer<LLImageFormatted> image, invnUploadFinish_f finish) : LLPointer<LLImageFormatted> image, invnUploadFinish_f finish) :
LLBufferedAssetUploadInfo(LLUUID::null, image, finish), LLBufferedAssetUploadInfo(LLUUID::null, image, finish),
mEmailFrom(emailFrom),
mNameFrom(nameFrom), mNameFrom(nameFrom),
mEmailTo(emailTo), mEmailTo(emailTo),
mSubject(subject), mSubject(subject),
...@@ -58,7 +57,6 @@ LLSD LLPostcardUploadInfo::generatePostBody() ...@@ -58,7 +57,6 @@ LLSD LLPostcardUploadInfo::generatePostBody()
LLSD postcard = LLSD::emptyMap(); LLSD postcard = LLSD::emptyMap();
postcard["pos-global"] = mGlobalPosition.getValue(); postcard["pos-global"] = mGlobalPosition.getValue();
postcard["to"] = mEmailTo; postcard["to"] = mEmailTo;
postcard["from"] = mEmailFrom;
postcard["name"] = mNameFrom; postcard["name"] = mNameFrom;
postcard["subject"] = mSubject; postcard["subject"] = mSubject;
postcard["msg"] = mMessage; postcard["msg"] = mMessage;
......
...@@ -53,13 +53,12 @@ class LLPostCard ...@@ -53,13 +53,12 @@ class LLPostCard
class LLPostcardUploadInfo : public LLBufferedAssetUploadInfo class LLPostcardUploadInfo : public LLBufferedAssetUploadInfo
{ {
public: 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, std::string subject, std::string message, LLVector3d globalPosition,
LLPointer<LLImageFormatted> image, invnUploadFinish_f finish); LLPointer<LLImageFormatted> image, invnUploadFinish_f finish);
virtual LLSD generatePostBody(); virtual LLSD generatePostBody();
private: private:
std::string mEmailFrom;
std::string mNameFrom; std::string mNameFrom;
std::string mEmailTo; std::string mEmailTo;
std::string mSubject; std::string mSubject;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment