livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix nearby chat floater ignoring 24h clock setting

master
Ansariel 2025-11-05 14:29:56 +01:00
parent 3bec0edebc
commit c82141c31a
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/fsfloaternearbychat.cpp
View File

@ -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;