summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterinspect.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2024-10-10 23:42:05 +0300
committerAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2025-09-10 22:48:16 +0300
commit003092955486dfb0882d49d6b40586431df6368b (patch)
tree96e3430aa6f3c4f0db8d7c5b69961c9b9f9bbc97 /indra/newview/llfloaterinspect.cpp
parent92c3cbbb04968b85ccb090258a2a6e8ba96628c6 (diff)
viewer#2172 AM/PM selector
Diffstat (limited to 'indra/newview/llfloaterinspect.cpp')
-rw-r--r--indra/newview/llfloaterinspect.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterinspect.cpp b/indra/newview/llfloaterinspect.cpp
index 4f993ca0e1..c0fe7ad896 100644
--- a/indra/newview/llfloaterinspect.cpp
+++ b/indra/newview/llfloaterinspect.cpp
@@ -220,7 +220,8 @@ void LLFloaterInspect::refresh()
}
time_t timestamp = (time_t) (obj->mCreationDate/1000000);
- std::string timeStr = getString("timeStamp");
+ static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+ std::string timeStr = use_24h ? getString("timeStamp") : getString("timeStampAMPM");
LLSD substitution;
substitution["datetime"] = (S32) timestamp;
LLStringUtil::format (timeStr, substitution);