summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorpavelkproductengine <none@none>2015-10-09 18:14:37 +0300
committerpavelkproductengine <none@none>2015-10-09 18:14:37 +0300
commitaf9971e43a37c47b7175bce0d350c73a282ff818 (patch)
treea70f1e78c27187daeaab364faece5d0d3f28d6ba /indra/newview/llviewermessage.cpp
parent17ff449ae6b2759f212daa4fd3de0a7ea2664866 (diff)
parent358b29060fc3caf8de212985b17686b4460cc6d9 (diff)
Merge Xcode 7 Update
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 {