summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorpavelkproductengine <pavelkproductengine@lindenlab.com>2015-08-04 20:09:15 +0300
committerpavelkproductengine <pavelkproductengine@lindenlab.com>2015-08-04 20:09:15 +0300
commit3912e48c625a80a972969987b7589ff8b893eed8 (patch)
treefc5751796d6fc25a2856bae384378d1ea29a8861 /indra/newview/llviewermessage.cpp
parent310ec101dfd2c69ecc1a51d0a3a8ea12d5fdaf7a (diff)
parent374a5b7dbe248eb62ab0fd919c13dd4fe41de3a2 (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 2775a320d4..b20367e54e 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2681,6 +2681,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();
@@ -5623,6 +5624,7 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)
}
}
final_args["MESSAGE"] = message;
+ payload["dest_id"] = dest_id;
notification = success ? "PaymentSent" : "PaymentFailure";
}
else {