summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2015-10-26 14:22:31 -0700
committercallum_linden <none@none>2015-10-26 14:22:31 -0700
commita89e87c72e6a351c6d1c74ae59a2d7010578d26c (patch)
tree46b3774ade40f99d1b2d1645b8e619ff5b6dc1ce /indra/newview/llviewermessage.cpp
parent16cd296e30e95fbacefff4e291fbdd6fbf0c2c43 (diff)
parent84150294b912d04e345007b65670c0230a2e4d79 (diff)
Merge with head of viewer release (3.8.6 changes)
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 e570657cf9..6ba10373b9 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2683,6 +2683,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();
@@ -5638,6 +5639,7 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)
}
}
final_args["MESSAGE"] = message;
+ payload["dest_id"] = dest_id;
notification = success ? "PaymentSent" : "PaymentFailure";
}
else {