diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-11-12 18:19:51 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-11-12 18:19:51 +0800 |
| commit | 3d33296c09a85174f044025a4bf51d7f63d73767 (patch) | |
| tree | a74b8ac75dfafeb5c134b4a7a4a3cc4936ce61d1 /indra | |
| parent | 6530f56b97f57cb7d80bb916a2b15af0b7f6c425 (diff) | |
| parent | fd51fbb4dfb17fcd2bfb019a55d2f067d1151f34 (diff) | |
Merge branch 'main' into maint-c
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lllogchat.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp index 51f30dd86b..98c805f3dc 100644 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -313,12 +313,14 @@ std::string LLLogChat::timestamp2LogString(U32 timestamp, bool withdate) if (use_24h) { timeStr += "[" + LLTrans::getString("TimeHour") + "]:[" - + LLTrans::getString("TimeMin") + "]"; + + LLTrans::getString("TimeMin") + "]:[" + + LLTrans::getString("TimeSec") + "]"; } else { timeStr += "[" + LLTrans::getString("TimeHour12") + "]:[" - + LLTrans::getString("TimeMin") + "] [" + + LLTrans::getString("TimeMin") + "]:[" + + LLTrans::getString("TimeSec") + "] [" + LLTrans::getString("TimeAMPM") + "]"; } |