diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-03-08 15:32:05 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-03-08 15:32:05 -0500 |
| commit | d6cd9d0771d04f014f5bd79ca05a5d0a86e5e2c6 (patch) | |
| tree | 7e49e12a21f5f19a9e382aeb1d2ae4391ca17553 /indra/newview/llpostcard.cpp | |
| parent | 08ed7f676f2ce38937a03c2a4e823e3564981264 (diff) | |
| parent | 94c2ebdea4cd9f9189d491baafe5aa08a8cfb7df (diff) | |
merge changes for MAINT-7156
Diffstat (limited to 'indra/newview/llpostcard.cpp')
| -rw-r--r-- | indra/newview/llpostcard.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
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; |