summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorpavelkproductengine <pavelkproductengine@lindenlab.com>2015-06-08 21:38:58 +0300
committerpavelkproductengine <pavelkproductengine@lindenlab.com>2015-06-08 21:38:58 +0300
commit9b021ec787d05881bb0804c77896aa85d4ccdfe9 (patch)
tree992942a68116f30787b7802dc9bd145a763df412 /indra/newview/llviewermessage.cpp
parentf3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff)
parentf62d6a886eef56c36ba6fe1758831ec31d4611c9 (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 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 {