diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-10-26 17:12:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-10-26 17:12:04 -0400 |
| commit | 54f39f86d205bdf52cd40fc0c4fcdd17ec694bb7 (patch) | |
| tree | 82685c6399bb058eda704f54c28ef47b5928d512 /indra/newview/llviewermessage.cpp | |
| parent | f676b02c45e81da5b22762acddcab8a8aa1cff71 (diff) | |
| parent | 84150294b912d04e345007b65670c0230a2e4d79 (diff) | |
merge changes for 3.8.6-release
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rwxr-xr-x | indra/newview/llviewermessage.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index e570657cf9..6ba10373b9 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2683,6 +2683,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) payload["sender_name"] = name; payload["group_id"] = group_id; payload["inventory_name"] = item_name; + payload["received_time"] = LLDate::now(); if(info && info->asLLSD()) { payload["inventory_offer"] = info->asLLSD(); @@ -5638,6 +5639,7 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg) } } final_args["MESSAGE"] = message; + payload["dest_id"] = dest_id; notification = success ? "PaymentSent" : "PaymentFailure"; } else { |