From c82141c31a20799eb4479569aea53e986b4a50ab Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 5 Nov 2025 14:29:56 +0100
Subject: [PATCH] Fix nearby chat floater ignoring 24h clock setting

---
 indra/newview/fsfloaternearbychat.cpp | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/indra/newview/fsfloaternearbychat.cpp b/indra/newview/fsfloaternearbychat.cpp
index 51e1d31fad..26601297f3 100644
--- a/indra/newview/fsfloaternearbychat.cpp
+++ b/indra/newview/fsfloaternearbychat.cpp
@@ -219,13 +219,25 @@ bool FSFloaterNearbyChat::postBuild()
     return LLFloater::postBuild();
 }
 
-std::string appendTime()
+static std::string appendTime()
 {
     time_t utc_time = time_corrected();
-    std::string timeStr ="[" + LLTrans::getString("TimeHour") + "]:[" + LLTrans::getString("TimeMin") + "]";
-    if (gSavedSettings.getBOOL("FSSecondsinChatTimestamps"))
+    std::string timeStr{};
+
+    if (gSavedSettings.getBOOL("Use24HourClock"))
     {
-        timeStr += ":[" + LLTrans::getString("TimeSec") + "]";
+        timeStr = "[" + LLTrans::getString("TimeHour") + "]:[" + LLTrans::getString("TimeMin") + "]";
+        if (gSavedSettings.getBOOL("FSSecondsinChatTimestamps"))
+        {
+            timeStr += ":[" + LLTrans::getString("TimeSec") + "]";
+        }
+    }
+    else
+    {
+        timeStr += "[" + LLTrans::getString("TimeHour12") + "]:["
+            + LLTrans::getString("TimeMin") + "]"
+            + (gSavedSettings.getBOOL("FSSecondsinChatTimestamps") ? ":[" + LLTrans::getString("TimeSec") + "] [" : " [")
+            + LLTrans::getString("TimeAMPM") + "]";
     }
 
     LLSD substitution;