From 18797f911e6510044a444104531a28b1f1aa5f2d Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 10 Oct 2024 23:42:05 +0300 Subject: viewer#2172 AM/PM selector --- indra/newview/llsidepaneliteminfo.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llsidepaneliteminfo.cpp') diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp index fccf745a74..68c5f3fb56 100644 --- a/indra/newview/llsidepaneliteminfo.cpp +++ b/indra/newview/llsidepaneliteminfo.cpp @@ -483,7 +483,8 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item) } else { - std::string timeStr = getString("acquiredDate"); + static bool use_24h = gSavedSettings.getBOOL("Use24HourClock"); + std::string timeStr = use_24h ? getString("acquiredDate24") : getString("acquiredDateAMPM"); LLSD substitution; substitution["datetime"] = (S32) time_utc; LLStringUtil::format (timeStr, substitution); -- cgit v1.2.3 From bed3b57c52574ec593293c7397dd0da18e801fb4 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 11 Oct 2024 18:50:14 +0300 Subject: viewer#2172 AM/PM selector #2 --- indra/newview/llsidepaneliteminfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llsidepaneliteminfo.cpp') diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp index 68c5f3fb56..385e4314a9 100644 --- a/indra/newview/llsidepaneliteminfo.cpp +++ b/indra/newview/llsidepaneliteminfo.cpp @@ -484,7 +484,7 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item) else { static bool use_24h = gSavedSettings.getBOOL("Use24HourClock"); - std::string timeStr = use_24h ? getString("acquiredDate24") : getString("acquiredDateAMPM"); + std::string timeStr = use_24h ? getString("acquiredDate") : getString("acquiredDateAMPM"); LLSD substitution; substitution["datetime"] = (S32) time_utc; LLStringUtil::format (timeStr, substitution); -- cgit v1.2.3