diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2023-03-31 17:16:26 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2023-03-31 17:17:21 +0300 |
| commit | 41d24952ff000af33d5f077e0b97845544cffef4 (patch) | |
| tree | 54ca2230563821d8cc2e04db966e1a0d81b761aa /indra/newview/llnotificationhandlerutil.cpp | |
| parent | 561f5f57c297c124950c49fb66e949d641064a97 (diff) | |
| parent | c7053a6928fd5eafdc935453742e92951ae4e0c1 (diff) | |
Merge branch 'main' into DRTVWR-539
# Conflicts:
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/llfloateravatarrendersettings.cpp
Diffstat (limited to 'indra/newview/llnotificationhandlerutil.cpp')
| -rw-r--r-- | indra/newview/llnotificationhandlerutil.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp index 39a0b9b50e..85adfaab55 100644 --- a/indra/newview/llnotificationhandlerutil.cpp +++ b/indra/newview/llnotificationhandlerutil.cpp @@ -275,7 +275,7 @@ void LLHandlerUtil::addNotifPanelToIM(const LLNotificationPtr& notification) LLSD offer; offer["notification_id"] = notification->getID(); offer["from"] = SYSTEM_FROM; - offer["time"] = LLLogChat::timestamp(false); + offer["time"] = LLLogChat::timestamp2LogString(0, false); // Use current time offer["index"] = (LLSD::Integer)session->mMsgs.size(); session->mMsgs.push_front(offer); |