summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorpavelkproductengine <pavelkproductengine@lindenlab.com>2015-08-18 18:02:37 +0300
committerpavelkproductengine <pavelkproductengine@lindenlab.com>2015-08-18 18:02:37 +0300
commit274c3a4ae555d76601f74045adb5b69fe0d5ba3d (patch)
treea3bf1fd9aaea493fb4ce98b576e50d334d04e877 /indra/newview/llviewermessage.cpp
parent1be63209331d509396bd7ee79302d511fe83d72e (diff)
parent3912e48c625a80a972969987b7589ff8b893eed8 (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 886725be79..fe94c068ee 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();
@@ -5635,6 +5636,7 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)
}
}
final_args["MESSAGE"] = message;
+ payload["dest_id"] = dest_id;
notification = success ? "PaymentSent" : "PaymentFailure";
}
else {