summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorpavelkproductengine <pavelkproductengine@lindenlab.com>2015-06-22 20:16:56 +0300
committerpavelkproductengine <pavelkproductengine@lindenlab.com>2015-06-22 20:16:56 +0300
commitc148c1d6d904785db0b8df09038be0184faa0317 (patch)
treefd598bb4dd3f4eea25464a6437ccce6f96a9e801 /indra/newview/llviewermessage.cpp
parente0f5ed29daa3b2803aaec60a77bde8df7df292ee (diff)
parent9b021ec787d05881bb0804c77896aa85d4ccdfe9 (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 {