diff options
author | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2015-05-18 21:08:22 +0300 |
---|---|---|
committer | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2015-05-18 21:08:22 +0300 |
commit | 9a93bb1861219175d24610a3055131782096dd69 (patch) | |
tree | c0d9682f233aff1f3d259b4803a85a0e289aac75 /indra/newview/llviewermessage.cpp | |
parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) | |
parent | 60d28437e616a6afda51a368ea40ad49a707d16c (diff) |
merge changes for MAINT-4734
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 5cd92c9920..d4330cedd0 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2678,6 +2678,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(); @@ -5620,6 +5621,7 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg) } } final_args["MESSAGE"] = message; + payload["dest_id"] = dest_id; notification = success ? "PaymentSent" : "PaymentFailure"; } else { |