summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorpavelkproductengine <pavelkproductengine@lindenlab.com>2015-07-15 22:59:59 +0300
committerpavelkproductengine <pavelkproductengine@lindenlab.com>2015-07-15 22:59:59 +0300
commit9131f7705974c84127bcc3109d2ab1c56cb1f009 (patch)
tree59b7494d361a9ad570ed3bcec9efdb6a5dff6166 /indra/newview/llviewermessage.cpp
parent02441157a0d22619ccf2a2ee735c8f5251b54fdb (diff)
parent3d4433de504c0ac17f2d3d98d3cbc43955cc1dda (diff)
merge changes for MAINT-4734
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rwxr-xr-xindra/newview/llviewermessage.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 459bdca8df..b393194b5d 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2680,6 +2680,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();
@@ -5622,6 +5623,7 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)
}
}
final_args["MESSAGE"] = message;
+ payload["dest_id"] = dest_id;
notification = success ? "PaymentSent" : "PaymentFailure";
}
else {