summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-11-12 18:17:59 +0800
committerErik Kundiman <erik@megapahit.org>2024-11-12 18:17:59 +0800
commit362d0668a5927a34856233266bc6559889a4b6ac (patch)
treecfbc23ca18cce4e4d49c568530880d10b0013bd6
parentd5d514d07f334953c674ef64d4474b2decef24b3 (diff)
parentfd51fbb4dfb17fcd2bfb019a55d2f067d1151f34 (diff)
Merge branch 'main' into 2024.09-ExtraFPS
-rw-r--r--indra/newview/lllogchat.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index bf49f33049..e398ca5cb7 100644
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -312,12 +312,14 @@ std::string LLLogChat::timestamp2LogString(U32 timestamp, bool withdate)
+ LLTrans::getString ("TimeMonth") + "]/["
+ LLTrans::getString ("TimeDay") + "] ["
+ LLTrans::getString ("TimeHour") + "]:["
- + LLTrans::getString ("TimeMin") + "]";
+ + LLTrans::getString ("TimeMin") + "]:[";
+ + LLTrans::getString ("TimeSec") + "]";
}
else
{
timeStr = "[" + LLTrans::getString("TimeHour") + "]:["
- + LLTrans::getString ("TimeMin")+"]";
+ + LLTrans::getString ("TimeMin")+"]:["
+ + LLTrans::getString ("TimeSec")+"]";
}
LLSD substitution;