diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-03-20 08:13:13 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-03-20 08:13:13 -0400 |
| commit | 6fb4bb4ed68026dcd23d88abeadcaa1cc8a1e893 (patch) | |
| tree | abae8bbfff3ddc80a59c3da913239c863a3df43d /indra/newview/llpostcard.cpp | |
| parent | 295c8a437afb29be1ec4b59acad60c35afb6ffc3 (diff) | |
| parent | 49e114748fdb52599aaa141c2006198c48aa083b (diff) | |
merge
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; |