diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-10-15 16:03:08 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-10-15 16:03:08 -0400 |
| commit | 64ecc38c841ae0cb0c3d0ccb9b1bf543ecf4230e (patch) | |
| tree | 24a954501d239ecaa43fe17f6f931e720383c6c2 /indra/newview/llchathistory.cpp | |
| parent | a2ae46ef3a0036a6030ccc1e3ef4fcdfb7f455f3 (diff) | |
| parent | cd712960f316496b29c53dce390dd778ad9d27f4 (diff) | |
Merge branch 'develop' into maxim/lua-nearby-avatars
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 3e02820feb..bb5ee558ca 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -426,6 +426,7 @@ public: time_t current_time = time_corrected(); time_t message_time = (time_t)(current_time - LLFrameTimer::getElapsedSeconds() + mTime); + // Report abuse shouldn't use AM/PM, use 24-hour time time_string = "[" + LLTrans::getString("TimeMonth") + "]/[" + LLTrans::getString("TimeDay") + "]/[" + LLTrans::getString("TimeYear") + "] [" |