diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-10-22 14:46:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-10-22 14:46:15 -0400 |
| commit | bfe759584f63c0587a2dc6a0086ad9d5b6c63a56 (patch) | |
| tree | 84653a1211908c7dd2ce5bc4877e79f8e6515099 /indra/newview/llfloaterinspect.cpp | |
| parent | 62fc3ceaf5251458239f91192a05edc64bedf33b (diff) | |
| parent | 394f7b37f2ec05c7cfb32c350432886f1c493c85 (diff) | |
Merge branch 'develop' into marchcat/xcode-16
Diffstat (limited to 'indra/newview/llfloaterinspect.cpp')
| -rw-r--r-- | indra/newview/llfloaterinspect.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterinspect.cpp b/indra/newview/llfloaterinspect.cpp index 0f1eb0cef0..5dea46843c 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); |