diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-11-13 12:24:44 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-11-13 12:24:44 +0800 |
| commit | 56ca0509f75bace9939a9126f7e0914ef2e21cad (patch) | |
| tree | 39b3e3f57725ce3322d43c509e1351b13e3b1f1c /indra/newview | |
| parent | 4ffc623e0fbb3e8a8559d7d833d70cb759ff8ebc (diff) | |
| parent | d3ff0a5b96e16cc54a3afbf49ecd73bb074786c0 (diff) | |
Merge branch 'main' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lllogchat.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp index e398ca5cb7..1db7bd978c 100644 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -312,7 +312,7 @@ 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 |