Merge branch 'develop' of https://github.com/secondlife/viewer

# Conflicts: # indra/newview/lllogchat.cpp # indra/newview/llnotificationlistitem.cpp # indra/newview/llpanelteleporthistory.cpp # indra/newview/lltoastgroupnotifypanel.cpp # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/skins/default/xui/en/panel_group_roles.xml
2025-09-11 23:10:40 +02:00 · 2025-09-11 23:10:40 +02:00 · 433cbb705d
parent 293c7ed4a3 c3c45e00ab
commit 433cbb705d
53 changed files with 398 additions and 137 deletions
--- a/indra/llcorehttp/llhttpconstants.cpp
+++ b/indra/llcorehttp/llhttpconstants.cpp
@ -100,6 +100,7 @@ const std::string HTTP_IN_HEADER_LOCATION("location");
 const std::string HTTP_IN_HEADER_RETRY_AFTER("retry-after");
 const std::string HTTP_IN_HEADER_SET_COOKIE("set-cookie");
 const std::string HTTP_IN_HEADER_USER_AGENT("user-agent");
+const std::string HTTP_IN_HEADER_X_CONTENT_TYPE_OPTIONS("x-content-type-options");
 const std::string HTTP_IN_HEADER_X_FORWARDED_FOR("x-forwarded-for");

 const std::string HTTP_CONTENT_LLSD_XML("application/llsd+xml");
@ -122,6 +123,7 @@ const std::string HTTP_CONTENT_IMAGE_BMP("image/bmp");

 const std::string HTTP_NO_CACHE("no-cache");
 const std::string HTTP_NO_CACHE_CONTROL("no-cache, max-age=0");
+const std::string HTTP_NOSNIFF("nosniff");

 const std::string HTTP_VERB_INVALID("(invalid)");
 const std::string HTTP_VERB_HEAD("HEAD");
--- a/indra/llcorehttp/llhttpconstants.h
+++ b/indra/llcorehttp/llhttpconstants.h
@ -190,6 +190,7 @@ extern const std::string HTTP_IN_HEADER_LOCATION;
 extern const std::string HTTP_IN_HEADER_RETRY_AFTER;
 extern const std::string HTTP_IN_HEADER_SET_COOKIE;
 extern const std::string HTTP_IN_HEADER_USER_AGENT;
+extern const std::string HTTP_IN_HEADER_X_CONTENT_TYPE_OPTIONS;
 extern const std::string HTTP_IN_HEADER_X_FORWARDED_FOR;

 //// HTTP Content Types ////
@ -215,5 +216,6 @@ extern const std::string HTTP_CONTENT_IMAGE_BMP;
 //// HTTP Cache Settings ////
 extern const std::string HTTP_NO_CACHE;
 extern const std::string HTTP_NO_CACHE_CONTROL;
+extern const std::string HTTP_NOSNIFF;

 #endif
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@ -17237,9 +17237,9 @@ Change of this parameter will affect the layout of buttons in notification toast
    <key>Use24HourClock</key>
    <map>
        <key>Comment</key>
-        <string>12 vs 24. At the moment only for region restart schedule floater</string>
+        <string>12 vs 24. At the moment coverage is partial</string>
        <key>Persist</key>
-        <integer>0</integer>
+        <integer>1</integer>
        <key>Type</key>
        <string>Boolean</string>
        <key>Value</key>
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@ -1425,10 +1425,19 @@ bool LLAppViewer::init()
        LLStringOps::setupMonthShortNames(LLTrans::getString("dateTimeMonthShortNames"));
        LLStringOps::setupDayFormat(LLTrans::getString("dateTimeDayFormat"));

-        LLStringOps::sAM = LLTrans::getString("dateTimeAM");
-        LLStringOps::sPM = LLTrans::getString("dateTimePM");
+        // <FS:Ansariel> Always override AM/PM because otherwise AM/PM indicator might be empty strings when calling using
+        // [ampm,datetime,...] formatting depending on locale
+        // LLStringOps::sAM = LLTrans::getString("dateTimeAM");
+        // LLStringOps::sPM = LLTrans::getString("dateTimePM");
+        // </FS:Ansariel>
    }

+    // <FS:Ansariel> Always override AM/PM because otherwise AM/PM indicator might be empty strings when calling using [ampm,datetime,...]
+    // formatting depending on locale
+    LLStringOps::sAM = LLTrans::getString("dateTimeAM");
+    LLStringOps::sPM = LLTrans::getString("dateTimePM");
+    // </FS:Ansariel>
+
    LLAgentLanguage::init();

    /// Tell the Coprocedure manager how to discover and store the pool sizes
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@ -455,6 +455,7 @@ public:
                time_t current_time = time_corrected();
                time_t message_time = (time_t)(current_time - LLFrameTimer::getElapsedSeconds() + mTime);

+                // Report abuse shouldn't use AM/PM, use 24-hour time
                time_string = "[" + LLTrans::getString("TimeMonth") + "]/["
                    + LLTrans::getString("TimeDay") + "]/["
                    + LLTrans::getString("TimeYear") + "] ["
--- a/indra/newview/llconversationlog.cpp
+++ b/indra/newview/llconversationlog.cpp
@ -123,11 +123,21 @@ const std::string LLConversation::createTimestamp(const U64Seconds& utc_time)
    LLSD substitution;
    substitution["datetime"] = (S32)utc_time.value();

-    timeStr = "["+LLTrans::getString ("TimeMonth")+"]/["
-                 +LLTrans::getString ("TimeDay")+"]/["
-                 +LLTrans::getString ("TimeYear")+"] ["
-                 +LLTrans::getString ("TimeHour")+"]:["
-                 +LLTrans::getString ("TimeMin")+"]";
+    static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+    timeStr = "[" + LLTrans::getString("TimeMonth") + "]/["
+        + LLTrans::getString("TimeDay") + "]/["
+        + LLTrans::getString("TimeYear") + "] [";
+    if (use_24h)
+    {
+        timeStr += LLTrans::getString("TimeHour") + "]:["
+            + LLTrans::getString("TimeMin") + "]";
+    }
+    else
+    {
+        timeStr += LLTrans::getString("TimeHour12") + "]:["
+            + LLTrans::getString("TimeMin") + "] ["
+            + LLTrans::getString("TimeAMPM") + "]";
+    }


    LLStringUtil::format (timeStr, substitution);
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@ -620,8 +620,19 @@ void LLFloaterIMSessionTab::deleteAllChildren()

 std::string LLFloaterIMSessionTab::appendTime()
 {
-    std::string timeStr = "[" + LLTrans::getString("TimeHour") + "]:"
-                          "[" + LLTrans::getString("TimeMin") + "]";
+    std::string timeStr;
+    static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+    if (use_24h)
+    {
+        timeStr = "[" + LLTrans::getString("TimeHour") + "]:"
+            "[" + LLTrans::getString("TimeMin") + "]";
+    }
+    else
+    {
+        timeStr = "[" + LLTrans::getString("TimeHour12") + "]:"
+            "[" + LLTrans::getString("TimeMin") + "] ["
+            + LLTrans::getString("TimeAMPM") + "]";
+    }

    LLSD substitution;
    substitution["datetime"] = (S32)time_corrected();
--- a/indra/newview/llfloaterinspect.cpp
+++ b/indra/newview/llfloaterinspect.cpp
@ -392,7 +392,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);
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@ -763,7 +763,8 @@ void LLPanelLandGeneral::refresh()

            // Display claim date
            time_t claim_date = parcel->getClaimDate();
-            std::string claim_date_str = getString("time_stamp_template");
+            static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+            std::string claim_date_str = use_24h ? getString("time_stamp_template") : getString("time_stamp_template_ampm");
            LLSD substitution;
            substitution["datetime"] = (S32) claim_date;
            LLStringUtil::format (claim_date_str, substitution);
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@ -700,6 +700,8 @@ bool LLFloaterPreference::postBuild()
    // </FS:Ansariel>

    getChild<LLComboBox>("language_combobox")->setCommitCallback(boost::bind(&LLFloaterPreference::onLanguageChange, this));
+    mTimeFormatCombobox = getChild<LLComboBox>("time_format_combobox");
+    mTimeFormatCombobox->setCommitCallback(boost::bind(&LLFloaterPreference::onTimeFormatChange, this));

    // <FS:CR> [CHUI MERGE]
    // We don't use these in FS Communications UI, should we in the future? Disabling for now.
@ -1723,6 +1725,13 @@ void LLFloaterPreference::onLanguageChange()
    }
 }

+void LLFloaterPreference::onTimeFormatChange()
+{
+    std::string val = mTimeFormatCombobox->getValue();
+    gSavedSettings.setBOOL("Use24HourClock", val == "1");
+    onLanguageChange();
+}
+
 void LLFloaterPreference::onNotificationsChange(const std::string& OptionName)
 {
    mNotificationOptions[OptionName] = getChild<LLComboBox>(OptionName)->getSelectedItemLabel();
@ -2372,6 +2381,8 @@ void LLFloaterPreference::refresh()
        advanced->refresh();
    }
    updateClickActionViews();
+
+    mTimeFormatCombobox->selectByValue(gSavedSettings.getBOOL("Use24HourClock") ? "1" : "0");
 }

 void LLFloaterPreference::onCommitWindowedMode()
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@ -128,6 +128,7 @@ protected:
    //void      onClickClearCache();            // Clear viewer texture cache, file cache on next startup // AO: was protected, moved to public
    void        onClickBrowserClearCache();     // Clear web history and caches as well as viewer caches above
    void        onLanguageChange();
+    void        onTimeFormatChange();
    void        onNotificationsChange(const std::string& OptionName);
    void        onNameTagOpacityChange(const LLSD& newvalue);
    void        onConsoleOpacityChange(const LLSD& newvalue);   // <FS:CR> FIRE-1332 - Sepeate opacity settings for nametag and console chat
@ -331,6 +332,7 @@ private:
    LLButton*       mDeleteTranscriptsBtn = nullptr;
    LLButton*       mEnablePopupBtn = nullptr;
    LLButton*       mDisablePopupBtn = nullptr;
+    LLComboBox*     mTimeFormatCombobox = nullptr;
    std::unique_ptr< ll::prefs::SearchData > mSearchData;
    bool mSearchDataDirty;

--- a/indra/newview/llfloaterurlentry.cpp
+++ b/indra/newview/llfloaterurlentry.cpp
@ -242,6 +242,16 @@ void LLFloaterURLEntry::getMediaTypeCoro(std::string url, LLHandle<LLFloater> pa
            resolvedMimeType = mimeType;
        }
    }
+    else if (resultHeaders.has(HTTP_IN_HEADER_X_CONTENT_TYPE_OPTIONS))
+    {
+        const std::string& val = resultHeaders[HTTP_IN_HEADER_X_CONTENT_TYPE_OPTIONS];
+        if (val == HTTP_NOSNIFF)
+        {
+            // Doesn't permit 'sniffing' mime type, default to either html or plain
+            // If this doesn't work user will have to choose something manually.
+            resolvedMimeType = HTTP_CONTENT_TEXT_HTML;
+        }
+    }

    floaterUrlEntry->headerFetchComplete(status.getType(), resolvedMimeType);

--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@ -84,13 +84,13 @@ const static std::string MULTI_LINE_PREFIX(" ");
 *
 * Note: "You" was used as an avatar names in viewers of previous versions
 */
-const static boost::regex TIMESTAMP_AND_STUFF("^(\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}\\]\\s+|\\[\\d{1,2}:\\d{2}\\]\\s+)?(.*)$");
-const static boost::regex TIMESTAMP("^(\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}\\]|\\[\\d{1,2}:\\d{2}\\]).*");
+const static boost::regex TIMESTAMP_AND_STUFF("^(\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}\\s[AaPp][Mm]\\]\\s+|\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}\\]\\s+|\\[\\d{1,2}:\\d{2}\\s[AaPp][Mm]\\]\\s+|\\[\\d{1,2}:\\d{2}\\]\\s+)?(.*)$");
+const static boost::regex TIMESTAMP("^(\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}(\\s[AaPp][Mm])?\\]|\\[\\d{1,2}:\\d{2}(\\s[AaPp][Mm])?\\]).*");
 // <FS:Ansariel> Timestamps in chat
 // Note: In contrast to the TIMESTAMP_AND_STUFF regex, for the TIMESTAMP_AND_STUFF_SEC regex the match
 // on the timestamp is NOT optional. We need this to decide during parsing if we have timestamps or not.
-const static boost::regex TIMESTAMP_AND_STUFF_SEC("^(\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}:\\d{2}\\]\\s+|\\[\\d{1,2}:\\d{2}:\\d{2}\\]\\s+)(.*)$");
-const static boost::regex TIMESTAMP_AND_SEC("^(\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}:\\d{2}\\]|\\[\\d{1,2}:\\d{2}:\\d{2}\\]).*");
+const static boost::regex TIMESTAMP_AND_STUFF_SEC("^(\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}:\\d{2}\\s[AaPp][Mm]\\]\\s+|\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}:\\d{2}\\]\\s+|\\[\\d{1,2}:\\d{2}:\\d{2}\\s[AaPp][Mm]\\]\\s+|\\[\\d{1,2}:\\d{2}:\\d{2}\\]\\s+)?(.*)$");
+const static boost::regex TIMESTAMP_AND_SEC("^(\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}:\\d{2}(\\s[AaPp][Mm])?\\]|\\[\\d{1,2}:\\d{2}:\\d{2}(\\s[AaPp][Mm])?\\]).*");
 // </FS:Ansariel>

 /**
@ -166,6 +166,10 @@ public:

    void checkAndCutOffDate(std::string& time_str)
    {
+        if (time_str.size() < 10) // not enough space for a date
+        {
+            return;
+        }
        // Cuts off the "%Y/%m/%d" from string for todays timestamps.
        // Assume that passed string has at least "%H:%M" time format.
        date log_date(not_a_date_time);
@ -182,20 +186,12 @@ public:

        if ( days_alive == zero_days )
        {
-            // Yep, today's so strip "%Y/%m/%d" info
-            ptime stripped_time(not_a_date_time);
-
-            mTimeStream.str(LLStringUtil::null);
-            mTimeStream << time_str;
-            mTimeStream >> stripped_time;
-            mTimeStream.clear();
-
-            time_str.clear();
-
-            mTimeStream.str(LLStringUtil::null);
-            mTimeStream << stripped_time;
-            mTimeStream >> time_str;
-            mTimeStream.clear();
+            size_t pos = time_str.find_first_of(' ');
+            if (pos != std::string::npos)
+            {
+                time_str.erase(0, pos + 1);
+                LLStringUtil::trim(time_str);
+            }
        }

        LL_DEBUGS("LLChatLogParser")
@ -381,28 +377,29 @@ std::string LLLogChat::timestamp2LogString(U32 timestamp, bool withdate)
    std::string timeStr;
    if (withdate)
    {
-        timeStr = "[" + LLTrans::getString ("TimeYear") + "]/["
-                  + LLTrans::getString ("TimeMonth") + "]/["
-                  + LLTrans::getString ("TimeDay") + "] ["
-                  + LLTrans::getString ("TimeHour") + "]:["
-                  + LLTrans::getString ("TimeMin") + "]";
+        timeStr = "[" + LLTrans::getString("TimeYear") + "]/["
+            + LLTrans::getString("TimeMonth") + "]/["
+            + LLTrans::getString("TimeDay") + "] ";
+    }
+
+    static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+    if (use_24h)
+    {
+        timeStr += "[" + LLTrans::getString("TimeHour") + "]:["
+            + LLTrans::getString("TimeMin") + "]";
        // <FS> Seconds in timestamps
        if (gSavedSettings.getBOOL("FSSecondsinChatTimestamps"))
        {
-            timeStr += ":[" + LLTrans::getString ("TimeSec") + "]";
+            timeStr += ":[" + LLTrans::getString("TimeSec") + "]";
        }
        // </FS>
    }
    else
    {
-        timeStr = "[" + LLTrans::getString("TimeHour") + "]:["
-                  + LLTrans::getString ("TimeMin")+"]";
-        // <FS> Seconds in timestamps
-        if (gSavedSettings.getBOOL("FSSecondsinChatTimestamps"))
-        {
-            timeStr += ":[" + LLTrans::getString ("TimeSec") + "]";
-        }
-        // </FS>
+        timeStr += "[" + LLTrans::getString("TimeHour12") + "]:["
+            + LLTrans::getString("TimeMin") + "]"
+            + (gSavedSettings.getBOOL("FSSecondsinChatTimestamps") ? ":[" + LLTrans::getString("TimeSec") + "] [" : " [") // <FS> Seconds in timestamps
+            + LLTrans::getString("TimeAMPM") + "]";
    }

    LLSD substitution;
--- a/indra/newview/llnotificationlistitem.cpp
+++ b/indra/newview/llnotificationlistitem.cpp
@ -38,6 +38,7 @@
 #include "lluicolortable.h"
 #include "message.h"
 #include "llnotificationsutil.h"
+#include "llviewercontrol.h"
 #include <boost/regex.hpp>

 LLNotificationListItem::LLNotificationListItem(const Params& p) : LLPanel(p),
@ -112,42 +113,60 @@ LLNotificationListItem::~LLNotificationListItem()
 std::string LLNotificationListItem::buildNotificationDate(const LLDate& time_stamp, ETimeType time_type)
 {
    std::string timeStr;
+
+    // <FS:Ansariel> FIRE-17649: Localizable date formats for group notices
+    static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+    timeStr = use_24h ? LLTrans::getString("NotificationItemDateString") : LLTrans::getString("NotificationItemDateStringAMPM");
+    // </FS:Ansariel>
+
    switch(time_type)
    {
        // <FS:Ansariel> FIRE-17649: Localizable date formats for group notices
        //case Local:
-        //  timeStr = "[" + LLTrans::getString("LTimeMthNum") + "]/["
-        //      +LLTrans::getString("LTimeDay")+"]/["
-        //      +LLTrans::getString("LTimeYear")+"] ["
-        //      +LLTrans::getString("LTimeHour")+"]:["
-        //      +LLTrans::getString("LTimeMin")+ "]";
-        //  break;
+        //    timeStr = "[" + LLTrans::getString("LTimeMthNum") + "]/["
+        //        +LLTrans::getString("LTimeDay")+"]/["
+        //        +LLTrans::getString("LTimeYear")+"] ["
+        //        +LLTrans::getString("LTimeHour")+"]:["
+        //        +LLTrans::getString("LTimeMin")+ "]";
+        //    break;
        //case UTC:
-        //  timeStr = "[" + LLTrans::getString("UTCTimeMth") + "]/["
-        //          +LLTrans::getString("UTCTimeDay")+"]/["
-        //      +LLTrans::getString("UTCTimeYr")+"] ["
-        //      +LLTrans::getString("UTCTimeHr")+"]:["
-        //      +LLTrans::getString("UTCTimeMin")+"] ["
-        //      +LLTrans::getString("UTCTimeTimezone")+"]";
-        //  break;
+        //    timeStr = "[" + LLTrans::getString("UTCTimeMth") + "]/["
+        //        +LLTrans::getString("UTCTimeDay")+"]/["
+        //        +LLTrans::getString("UTCTimeYr")+"] ["
+        //        +LLTrans::getString("UTCTimeHr")+"]:["
+        //        +LLTrans::getString("UTCTimeMin")+"] ["
+        //        +LLTrans::getString("UTCTimeTimezone")+"]";
+        //    break;
        //case SLT:
        //default:
-        //  timeStr = "[" + LLTrans::getString("TimeMonth") + "]/["
-        //      +LLTrans::getString("TimeDay")+"]/["
-        //      +LLTrans::getString("TimeYear")+"] ["
-        //      +LLTrans::getString("TimeHour")+"]:["
-        //      +LLTrans::getString("TimeMin")+"] ["
-        //      +LLTrans::getString("TimeTimezone")+"]";
-        //  break;
+        //    timeStr = "[" + LLTrans::getString("TimeMonth") + "]/["
+        //        +LLTrans::getString("TimeDay")+"]/["
+        //        +LLTrans::getString("TimeYear")+"] [";
+
+        //    static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+        //    if (use_24h)
+        //    {
+        //        timeStr += LLTrans::getString("TimeHour") + "]:["
+        //            + LLTrans::getString("TimeMin") + "] ["
+        //            + LLTrans::getString("TimeTimezone") + "]";
+        //    }
+        //    else
+        //    {
+        //        timeStr += LLTrans::getString("TimeHour12") + "]:["
+        //            + LLTrans::getString("TimeMin") + "] ["
+        //            + LLTrans::getString("TimeAMPM") + "] ["
+        //            + LLTrans::getString("TimeTimezone") + "]";
+        //    }
+        //    break;
        case Local:
-            timeStr = LLTrans::getString("NotificationItemDateStringLocal");
+            LLStringUtil::replaceString(timeStr, "utc", "local");
            break;
        case UTC:
-            timeStr = LLTrans::getString("NotificationItemDateStringUTC");
+            // No-op (utc is default)
            break;
        case SLT:
        default:
-            timeStr = LLTrans::getString("NotificationItemDateStringSLT");
+            LLStringUtil::replaceString(timeStr, "utc", "slt");
            break;
        // </FS:Ansariel>
    }
--- a/indra/newview/llpanelgroupnotices.cpp
+++ b/indra/newview/llpanelgroupnotices.cpp
@ -204,7 +204,8 @@ std::string build_notice_date(const U32& the_time)
    //                          + LLTrans::getString("LTimeHour") + "]:["
    //                          + LLTrans::getString("LTimeMin") + "]:["
    //                          + LLTrans::getString("LTimeSec") + "]";
-    std::string dateStr = LLTrans::getString("GroupNoticesPanelDateString");
+    static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+    std::string dateStr = use_24h ? LLTrans::getString("GroupNoticesPanelDateString") : LLTrans::getString("GroupNoticesPanelDateStringAMPM");
    // </FS:Ansariel>

    LLSD substitution;
--- a/indra/newview/llpanellandmarkinfo.cpp
+++ b/indra/newview/llpanellandmarkinfo.cpp
@ -41,6 +41,7 @@
 #include "lllandmarkactions.h"
 #include "llparcel.h"
 #include "llslurl.h"
+#include "llviewercontrol.h"
 #include "llviewerinventory.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
@ -326,7 +327,8 @@ void LLPanelLandmarkInfo::displayItemInfo(const LLInventoryItem* pItem)
    }
    else
    {
-        std::string timeStr = getString("acquired_date");
+        static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+        std::string timeStr = use_24h ? getString("acquired_date") : getString("acquired_date_ampm");
        LLSD substitution;
        substitution["datetime"] = (S32) time_utc;
        LLStringUtil::format (timeStr, substitution);
--- a/indra/newview/llpanelteleporthistory.cpp
+++ b/indra/newview/llpanelteleporthistory.cpp
@ -42,6 +42,7 @@
 #include "llnotificationsutil.h"
 #include "lltextbox.h"
 #include "lltoggleablemenu.h"
+#include "llviewercontrol.h"
 #include "llviewermenu.h"
 #include "lllandmarkactions.h"
 #include "llclipboard.h"
@ -252,15 +253,26 @@ std::string LLTeleportHistoryFlatItem::getTimestamp()
    //// Only show timestamp for today and yesterday
    //if(time_diff < seconds_today + seconds_in_day)
    //{
-    //  timestamp = "[" + LLTrans::getString("TimeHour12")+"]:["
-    //                  + LLTrans::getString("TimeMin")+"] ["+ LLTrans::getString("TimeAMPM")+"]";
-    //  LLSD substitution;
-    //  substitution["datetime"] = (S32) date.secondsSinceEpoch();
-    //  LLStringUtil::format(timestamp, substitution);
+    //    static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+    //    if (use_24h)
+    //    {
+    //        timestamp = "[" + LLTrans::getString("TimeHour") + "]:["
+    //            + LLTrans::getString("TimeMin") + "]";
+    //    }
+    //    else
+    //    {
+    //        timestamp = "[" + LLTrans::getString("TimeHour12") + "]:["
+    //            + LLTrans::getString("TimeMin") + "] [" + LLTrans::getString("TimeAMPM") + "]";
+    //    }
+
+    //    LLSD substitution;
+    //    substitution["datetime"] = (S32) date.secondsSinceEpoch();
+    //    LLStringUtil::format(timestamp, substitution);
    //}
    LLSD args;
    args["datetime"] = date.secondsSinceEpoch();
-    timestamp = getString("DateFmt");
+    static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+    timestamp = use_24h ? getString("DateFmt") : getString("DateFmtAMPM");
    //<FS:Beq [timezone support for teleport history]>
    // Check whether we have an override for the timezone
    static const std::string xml_timezone = "utc"; // In case we decide to change the XML default !
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@ -527,7 +527,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("acquiredDate") : getString("acquiredDateAMPM");
        LLSD substitution;
        substitution["datetime"] = (S32) time_utc;
        LLStringUtil::format (timeStr, substitution);
--- a/indra/newview/lltoastgroupnotifypanel.cpp
+++ b/indra/newview/lltoastgroupnotifypanel.cpp
@ -97,16 +97,28 @@ LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(const LLNotificationPtr& notifi
    const std::string& message = payload["message"].asString();

    // <FS:Ansariel> FIRE-17649: Localizable date formats for group notices
-    //std::string timeStr = "["+LLTrans::getString("TimeWeek")+"], ["
-    //                      +LLTrans::getString("TimeMth")+"] ["
-    //                      +LLTrans::getString("TimeDay")+"] ["
-    //                      +LLTrans::getString("TimeYear")+"] ["
-    //                      +LLTrans::getString("TimeHour")+"]:["
-    //                      +LLTrans::getString("TimeMin")+"]:["
-    //                      +LLTrans::getString("TimeSec")+"] ["
-    //                      +LLTrans::getString("TimeTimezone")+"]";
-    std::string timeStr = LLTrans::getString("GroupNoticesToastDateString");
+    //std::string timeStr = "[" + LLTrans::getString("TimeWeek") + "], ["
+    //                          + LLTrans::getString("TimeMonth") + "]/["
+    //                          + LLTrans::getString("TimeDay") + "]/["
+    //                          + LLTrans::getString("TimeYear") + "] [";
+    //static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+    //if (use_24h)
+    //{
+    //    timeStr += LLTrans::getString("TimeHour") + "]:["
+    //        + LLTrans::getString("TimeMin") + "] ["
+    //        + LLTrans::getString("TimeTimezone") + "]";
+    //}
+    //else
+    //{
+    //    timeStr += LLTrans::getString("TimeHour12") + "]:["
+    //        + LLTrans::getString("TimeMin") + "] ["
+    //        + LLTrans::getString("TimeAMPM") + "] ["
+    //        + LLTrans::getString("TimeTimezone") + "]";
+    //}
+    static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+    std::string timeStr = use_24h ? LLTrans::getString("GroupNoticesToastDateString") : LLTrans::getString("GroupNoticesToastDateStringAMPM");
    // </FS:Ansariel>
+
    const LLDate timeStamp = notification->getDate();
    LLDate notice_date = timeStamp.notNull() ? timeStamp : payload["received_time"].asDate();
    LLSD substitution;
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@ -1650,6 +1650,11 @@ void render_ui(F32 zoom_factor, int subfield)
                render_disconnected_background();
            }
        }
+        else
+        {
+            // Make sure particle effects disappear
+            LLHUDObject::renderAllForTimer();
+        }

        if (render_ui)
        {
--- a/indra/newview/llworldmap.cpp
+++ b/indra/newview/llworldmap.cpp
@ -32,6 +32,7 @@
 #include "message.h"
 #include "lltracker.h"
 #include "lluistring.h"
+#include "llviewercontrol.h"
 #include "llviewertexturelist.h"
 #include "lltrans.h"
 #include "llgltexture.h"
@ -555,9 +556,20 @@ bool LLWorldMap::insertItem(U32 x_world, U32 y_world, std::string& name, LLUUID&
        case MAP_ITEM_MATURE_EVENT:
        case MAP_ITEM_ADULT_EVENT:
        {
-            std::string timeStr = "["+ LLTrans::getString ("TimeHour")+"]:["
-                                       +LLTrans::getString ("TimeMin")+"] ["
-                                       +LLTrans::getString ("TimeAMPM")+"]";
+            std::string timeStr;
+
+            static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+            if (use_24h)
+            {
+                timeStr = "[" + LLTrans::getString("TimeHour") + "]:["
+                    + LLTrans::getString("TimeMin") + "]";
+            }
+            else
+            {
+                timeStr = "[" + LLTrans::getString("TimeHour12") + "]:["
+                    + LLTrans::getString("TimeMin") + "] ["
+                    + LLTrans::getString("TimeAMPM") + "]";
+            }
            LLSD substitution;
            substitution["datetime"] = (S32) extra;
            LLStringUtil::format (timeStr, substitution);
--- a/indra/newview/skins/default/xui/az/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/az/panel_teleport_history_item.xml
@ -3,6 +3,9 @@
 	<panel.string name="DateFmt">
 		[day,datetime,utc].[mthnum,datetime,utc].[year,datetime,utc] [hour,datetime,utc]:[min,datetime,utc]
 	</panel.string>
+	<panel.string name="DateFmtAMPM">
+		[day,datetime,utc].[mthnum,datetime,utc].[year,datetime,utc] [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
+	</panel.string>
 	<layout_stack name="ls_item">
 		<layout_panel name="lp_date">
 			<text name="timestamp" value="01.01.2000 12:00"/>
--- a/indra/newview/skins/default/xui/az/strings.xml
+++ b/indra/newview/skins/default/xui/az/strings.xml
@ -6706,17 +6706,20 @@ Yerləşməniz: [AVATAR_POS]
 	<string name="GroupNoticesPanelDateString">
 		[day,datetime,local].[mthnum,datetime,local].[year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
 	</string>
+	<string name="GroupNoticesPanelDateStringAMPM">
+		[day,datetime,local].[mthnum,datetime,local].[year,datetime,local] [hour12,datetime,local]:[min,datetime,local]:[second,datetime,local] [ampm,datetime,local]
+	</string>
 	<string name="GroupNoticesToastDateString">
 		[wkday,datetime,slt], [day,datetime,slt] [mth,datetime,slt] [year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [timezone,datetime,slt]
 	</string>
-	<string name="NotificationItemDateStringLocal">
-		[day,datetime,local].[mthnum,datetime,local].[year,datetime,local] [hour,datetime,local]:[min,datetime,local]
+	<string name="GroupNoticesToastDateStringAMPM">
+		[wkday,datetime,slt], [day,datetime,slt] [mth,datetime,slt] [year,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [ampm,datetime,slt] [timezone,datetime,slt]
 	</string>
-	<string name="NotificationItemDateStringUTC">
+	<string name="NotificationItemDateString">
 		[day,datetime,utc] [mth,datetime,utc] [year,datetime,utc] [hour,datetime,utc]:[min,datetime,utc] [timezone,datetime,utc]
 	</string>
-	<string name="NotificationItemDateStringSLT">
-		[day,datetime,slt].[mthnum,datetime,slt].[year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt] [timezone,datetime,slt]
+	<string name="NotificationItemDateStringAMPM">
+		[day,datetime,utc] [mth,datetime,utc] [year,datetime,utc] [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] [timezone,datetime,utc]
 	</string>
 	<string name="Pie_av_render_normally">
 		Adətən
--- a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml
@ -15,6 +15,9 @@
 	<panel.string name="acquiredDate">
 		[wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt]
 	</panel.string>
+  <panel.string name="acquiredDateAMPM">
+    [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour12,datetime,local]:[min,datetime,local]:[second,datetime,local] [ampm,datetime,local] [year,datetime,local]
+  </panel.string>
 	<panel.string name="origin_inventory">
 		(Beholdning)
 	</panel.string>
--- a/indra/newview/skins/default/xui/de/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_about_land.xml
@ -71,8 +71,11 @@
 			<panel.string name="no_selection_text">
 				Keine Parzelle ausgewählt.
 			</panel.string>
+			<panel.string name="time_stamp_template_ampm">
+				[wkday,datetime,slt]. [day,datetime,slt]. [mth,datetime,slt]. [year,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [ampm,datetime,slt]
+			</panel.string>
 			<panel.string name="time_stamp_template">
-				[wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt]
+				[wkday,datetime,slt]. [day,datetime,slt]. [mth,datetime,slt]. [year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]
 			</panel.string>
 			<panel.string name="error_resolving_uuid">
 				Parzellen-ID konnte nicht ermittelt werden.
--- a/indra/newview/skins/default/xui/de/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/de/floater_inspect.xml
@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="inspect" title="Objekte untersuchen">
+	<floater.string name="timeStampAMPM">
+		[wkday,datetime,slt]. [day,datetime,slt]. [mth,datetime,slt]. [year,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [ampm,datetime,slt]
+	</floater.string>
 	<floater.string name="timeStamp">
-		[wkday,datetime,slt] [day,datetime,slt]. [mth,datetime,slt] [year,datetime,slt], [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]
+		[wkday,datetime,slt]. [day,datetime,slt]. [mth,datetime,slt]. [year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]
 	</floater.string>
 	<floater.string name="Group">
 		(Gruppe)
--- a/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
@ -5,7 +5,8 @@
 	<floater.string name="public">(öffentlich)</floater.string>
 	<floater.string name="you_can">Sie können:</floater.string>
 	<floater.string name="owner_can">Eigentümer kann:</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
+	<floater.string name="acquiredDate">[wkday,datetime,local]. [day,datetime,local]. [mth,datetime,local]. [year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]</floater.string>
+	<floater.string name="acquiredDateAMPM">[wkday,datetime,local]. [day,datetime,local]. [mth,datetime,local]. [year,datetime,local] [hour12,datetime,local]:[min,datetime,local]:[second,datetime,local] [ampm,datetime,local]</floater.string>
 	<text name="LabelItemNameTitle">Name:</text>
 	<text name="LabelItemDescTitle">Beschreibung:</text>
 	<text name="LabelCreatorTitle">Ersteller:</text>
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@ -659,7 +659,7 @@ Möchten Sie den Viewer schließen und anschließend manuell neu starten, um die
 		<usetemplate name="okcancelbuttons" notext="Später" yestext="Jetzt beenden"/>
 	</notification>
 	<notification name="ChangeLanguage">
-		Die Sprachänderung tritt nach Neustart von [APP_NAME] in Kraft.
+		Die Änderung der Sprache oder des Uhrzeitformats tritt nach Neustart von [APP_NAME] in Kraft.
 	</notification>
 	<notification name="GoToAuctionPage">
 		Zur [CURRENT_GRID]-Webseite, um Auktionen anzuzeigen oder ein Gebot abzugeben?
--- a/indra/newview/skins/default/xui/de/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/de/panel_landmark_info.xml
@ -15,8 +15,11 @@
 	<string name="server_forbidden_text">
 		Die Informationen über diesen Standort sind zugriffsbeschränkt.  Bitte wenden Sie sich bezüglich Ihrer Berechtigungen an den Eigentümer der Parzelle.
 	</string>
+	<string name="acquired_date_ampm">
+		[wkday,datetime,slt]. [day,datetime,slt]. [mth,datetime,slt]. [year,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [ampm,datetime,slt]
+	</string>
 	<string name="acquired_date">
-		[wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt]
+		[wkday,datetime,slt]. [day,datetime,slt]. [mth,datetime,slt]. [year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]
 	</string>
 	<string name="information_text">
 		Traffic: [TRAFFIC] Gebiet: [AREA] m²
--- a/indra/newview/skins/default/xui/de/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/de/panel_place_profile.xml
@ -38,10 +38,12 @@
 	<string name="server_forbidden_text">
 		Die Informationen über diesen Standort sind zugriffsbeschränkt.  Bitte wenden Sie sich bezüglich Ihrer Berechtigungen an den Eigentümer der Parzelle.
 	</string>
-	<string name="acquired_date">
-		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
+	<string name="acquired_date_ampm">
+		[wkday,datetime,local]. [day,datetime,local]. [mth,datetime,local]. [year,datetime,local] [hour12,datetime,local]:[min,datetime,local]:[second,datetime,local] [ampm,datetime,local]
+	</string>
+	<string name="acquired_date">
+		[wkday,datetime,local]. [day,datetime,local]. [mth,datetime,local]. [year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
 	</string>
-
 	<layout_stack name="place_info_sidetray_main">
 		<layout_panel name="header_container">

--- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
@ -20,6 +20,16 @@
 	<text name="language_textbox2">
 		(Erfordert Neustart)
 	</text>
+	<text name="time_format_textbox">
+		Uhrzeitformat:
+	</text>
+	<combo_box name="time_format_combobox">
+		<combo_box.item label="1:00 AM" name="12H"/>
+		<combo_box.item label="13:00" name="24H"/>
+	</combo_box>
+	<text name="time_format_textbox2">
+		(Erfordert Neustart)
+	</text>
 	<check_box label="IME-Texteingabe aktivieren" name="use_ime" tool_tip="Input Method Editor für Texteingabe aktivieren - nur für spezielle Sprachen wie z.B. Japanisch oder Chinesisch benötigt."/>
 	<text name="maturity_desired_prompt" width="320">
 		Auf Inhalte mit folgender Einstufung zugreifen:
--- a/indra/newview/skins/default/xui/de/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/de/panel_teleport_history_item.xml
@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="teleport_history_item">
 	<panel.string name="DateFmt">
-		[day,datetime,utc].[mthnum,datetime,utc].[year,datetime,utc], [hour,datetime,utc]:[min,datetime,utc]
+		[day,datetime,utc].[mthnum,datetime,utc].[year,datetime,utc] [hour,datetime,utc]:[min,datetime,utc]
+	</panel.string>
+	<panel.string name="DateFmtAMPM">
+		[day,datetime,utc].[mthnum,datetime,utc].[year,datetime,utc] [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
 	</panel.string>
 	<layout_stack name="ls_item">
 		<layout_panel name="lp_region" width="165">
--- a/indra/newview/skins/default/xui/de/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_item_info.xml
@ -19,7 +19,10 @@
 		Eigentümer kann:
 	</panel.string>
 	<panel.string name="acquiredDate">
-		[wkday,datetime,slt]. [day,datetime,slt]. [mth,datetime,slt]. [year,datetime,slt], [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]
+		[wkday,datetime,slt]. [day,datetime,slt]. [mth,datetime,slt]. [year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]
+	</panel.string>
+	<panel.string name="acquiredDateAMPM">
+		[wkday,datetime,slt]. [day,datetime,slt]. [mth,datetime,slt]. [year,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [ampm,datetime,slt]
 	</panel.string>
 	<panel.string name="origin_inventory">
 		(Inventar)
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@ -2954,7 +2954,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich unter http://suppo
 		Soll
 	</string>
 	<string name="GroupMoneyStartDate">
-		Transaktionen seit [weekday,datetime,utc], [day,datetime,utc]. [mth,datetime,utc] [year,datetime,utc]
+		Transaktionen seit [weekday,datetime,utc], [day,datetime,utc]. [mth,datetime,utc]. [year,datetime,utc]
 	</string>
 	<string name="AcquiredItems">
 		Erworbene Artikel
@ -5430,10 +5430,10 @@ Falls der Fehler weiterhin auftritt, überprüfen Sie bitte Ihre Netzwerk- und F
 		[MDAY]
 	</string>
 	<string name="dateTimeAM">
-		Uhr
+		AM
 	</string>
 	<string name="dateTimePM">
-		Uhr
+		PM
 	</string>
 	<string name="LocalEstimateUSD">
 		[AMOUNT] US$
@ -7212,17 +7212,20 @@ Ihre aktuelle Position: [AVATAR_POS]
 	<string name="GroupNoticesPanelDateString">
 		[day,datetime,local].[mthnum,datetime,local].[year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
 	</string>
+	<string name="GroupNoticesPanelDateStringAMPM">
+		[day,datetime,local].[mthnum,datetime,local].[year,datetime,local] [hour12,datetime,local]:[min,datetime,local]:[second,datetime,local] [ampm,datetime,local]
+	</string>
 	<string name="GroupNoticesToastDateString">
-		[wkday,datetime,slt]., [day,datetime,slt]. [mth,datetime,slt]. [year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [timezone,datetime,slt]
+		[wkday,datetime,slt]. [day,datetime,slt]. [mth,datetime,slt]. [year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [timezone,datetime,slt]
 	</string>
-	<string name="NotificationItemDateStringLocal">
-		[day,datetime,local].[mthnum,datetime,local].[year,datetime,local] [hour,datetime,local]:[min,datetime,local]
+	<string name="GroupNoticesToastDateStringAMPM">
+		[wkday,datetime,slt]. [day,datetime,slt]. [mth,datetime,slt]. [year,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [ampm,datetime,slt] [timezone,datetime,slt]
 	</string>
-	<string name="NotificationItemDateStringUTC">
-		[day,datetime,utc].[mth,datetime,utc].[year,datetime,utc] [hour,datetime,utc]:[min,datetime,utc] [timezone,datetime,utc]
+	<string name="NotificationItemDateString">
+		[day,datetime,utc]. [mth,datetime,utc]. [year,datetime,utc] [hour,datetime,utc]:[min,datetime,utc] [timezone,datetime,utc]
 	</string>
-	<string name="NotificationItemDateStringSLT">
-		[day,datetime,slt].[mthnum,datetime,slt].[year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt] [timezone,datetime,slt]
+	<string name="NotificationItemDateStringAMPM">
+		[day,datetime,utc]. [mth,datetime,utc]. [year,datetime,utc] [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] [timezone,datetime,utc]
 	</string>
 	<string name="Pie_av_render_normally">
 		Normal
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@ -120,6 +120,9 @@
             name="no_selection_text">
                No parcel selected.
            </panel.string>
+            <panel.string name="time_stamp_template_ampm">
+              [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [ampm,datetime,slt] [year,datetime,slt]
+            </panel.string>
            <panel.string name="time_stamp_template">
              [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt]
            </panel.string>
--- a/indra/newview/skins/default/xui/en/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/en/floater_inspect.xml
@ -11,9 +11,13 @@
 save_rect="true"
 title="Inspect Objects"
 width="610">
+    <floater.string
+     name="timeStampAMPM">
+      [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [ampm,datetime,slt] [year,datetime,slt]
+    </floater.string>
    <floater.string
     name="timeStamp">
-        [year,datetime,slt] [mth,datetime,slt] [day,datetime,slt], [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt], [wkday,datetime,slt]
+      [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt]
    </floater.string>
    <floater.string
     name="Group">
--- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
@ -32,6 +32,10 @@
     name="acquiredDate">
        [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
    </floater.string>
+    <floater.string
+     name="acquiredDateAMPM">
+        [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour12,datetime,local]:[min,datetime,local]:[second,datetime,local] [ampm,datetime,local] [year,datetime,local]
+    </floater.string>
    <icon
     follows="top|right"
     height="18"
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@ -1718,7 +1718,7 @@ Would you like to shutdown the viewer and launch it manually again in order to a
   icon="alertmodal.tga"
   name="ChangeLanguage"
   type="alertmodal">
-The selected language will be applied after restarting [APP_NAME].
+The selected language or zime format will be applied after restarting [APP_NAME].
  </notification>

  <notification
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@ -39,6 +39,10 @@
     name="server_forbidden_text">
        Information about this location is unavailable due to access restrictions.  Please check your permissions with the parcel owner.
    </string>
+    <string
+     name="acquired_date_ampm">
+        [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [ampm,datetime,slt] [year,datetime,slt]
+    </string>
    <string
     name="acquired_date">
        [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt]
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@ -87,6 +87,10 @@
     name="server_forbidden_text">
        Information about this location is unavailable due to access restrictions.  Please check your permissions with the parcel owner.
    </string>
+    <string
+     name="acquired_date_ampm">
+        [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour12,datetime,local]:[min,datetime,local]:[second,datetime,local] [ampm,datetime,local] [year,datetime,local]
+    </string>
    <string
     name="acquired_date">
        [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@ -104,7 +104,7 @@
         value="zh" />
    </combo_box>
    <text
-	 top_delta="4"
+     top_delta="4"
     font="SansSerifSmall"
     type="string"
     text_color="White_50"
@ -117,6 +117,51 @@
     width="130">
        (Requires restart)
    </text>
+   <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="15"
+     layout="topleft"
+     left="300"
+     name="time_format_textbox"
+     top="10"
+     width="200">
+        Time Format:
+    </text>
+    <combo_box
+     follows="left|top"
+     height="23"
+     layout="topleft"
+     left="300"
+     max_chars="135"
+     name="time_format_combobox"
+     width="70">
+        <combo_box.item
+         enabled="true"
+         label="1:00 AM"
+         name="12H"
+         value="0" />
+        <combo_box.item
+         enabled="true"
+         label="13:00"
+         name="24H"
+         value="1" />
+    </combo_box>
+    <text
+     top_delta="4"
+     font="SansSerifSmall"
+     type="string"
+     text_color="White_50"
+     length="1"
+     follows="left|top"
+     height="15"
+     layout="topleft"
+     left_pad="5"
+     name="time_format_textbox2"
+     width="130">
+        (Requires restart)
+    </text>
    <check_box
     control_name="SDL2IMEEnabled"
     height="16"
--- a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
@ -8,6 +8,9 @@
 top="0"
 width="380">
    <panel.string name="DateFmt">
+        [mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc], [hour,datetime,utc]:[min,datetime,utc]
+    </panel.string>
+    <panel.string name="DateFmtAMPM">
        [mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc], [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
    </panel.string>
    <icon
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@ -31,6 +31,10 @@
    name="owner_can">
    Owner can:
  </panel.string>
+  <panel.string
+    name="acquiredDateAMPM">
+    [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [year,datetime,slt], [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [ampm,datetime,slt]
+  </panel.string>
  <panel.string
    name="acquiredDate">
    [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [year,datetime,slt], [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@ -3275,10 +3275,11 @@ Your current position: [AVATAR_POS]
  <string name="CallingCardOnlineLabelSuffix">(online)</string>
  
  <string name="GroupNoticesPanelDateString">[year,datetime,local]/[mthnum,datetime,local]/[day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]</string>
-  <string name="GroupNoticesToastDateString">[wkday,datetime,slt], [mth,datetime,slt] [day,datetime,slt] [year,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [ampm,datetime,slt] [timezone,datetime,slt]</string>
-  <string name="NotificationItemDateStringLocal">[mthnum,datetime,local]/[day,datetime,local]/[year,datetime,local] [hour,datetime,local]:[min,datetime,local]</string>
-  <string name="NotificationItemDateStringUTC">[mth,datetime,utc]/[day,datetime,utc]/[year,datetime,utc] [hour,datetime,utc]:[min,datetime,utc] [timezone,datetime,utc]</string>
-  <string name="NotificationItemDateStringSLT">[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt] [timezone,datetime,slt]</string>
+  <string name="GroupNoticesPanelDateStringAMPM">[year,datetime,local]/[mthnum,datetime,local]/[day,datetime,local] [hour12,datetime,local]:[min,datetime,local]:[second,datetime,local] [timezone,datetime,local]</string>
+  <string name="GroupNoticesToastDateString">[wkday,datetime,slt], [mth,datetime,slt] [day,datetime,slt] [year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [timezone,datetime,slt]</string>
+  <string name="GroupNoticesToastDateStringAMPM">[wkday,datetime,slt], [mth,datetime,slt] [day,datetime,slt] [year,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [ampm,datetime,slt] [timezone,datetime,slt]</string>
+  <string name="NotificationItemDateString">[mth,datetime,utc]/[day,datetime,utc]/[year,datetime,utc] [hour,datetime,utc]:[min,datetime,utc] [timezone,datetime,utc]</string>
+  <string name="NotificationItemDateStringAMPM">[mth,datetime,utc]/[day,datetime,utc]/[year,datetime,utc] [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,ampm] [timezone,datetime,utc]</string>

  <string name="Pie_av_render_normally">Normally</string>
  <string name="Pie_av_render_never">Never</string>
--- a/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml
@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="teleport_history_item">
 	<panel.string name="DateFmt">
-		[year,datetime,utc]/[mthnum,datetime,utc]/[day,datetime,utc] [hour24,datetime,utc]:[min,datetime,utc]
+		[year,datetime,utc]/[mthnum,datetime,utc]/[day,datetime,utc] [hour,datetime,utc]:[min,datetime,utc]
+	</panel.string>
+	<panel.string name="DateFmtAMPM">
+		[year,datetime,utc]/[mthnum,datetime,utc]/[day,datetime,utc] [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
 	</panel.string>
 	<layout_stack name="ls_item">
 		<layout_panel name="lp_date">
--- a/indra/newview/skins/default/xui/fr/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/fr/panel_teleport_history_item.xml
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="teleport_history_item">
 	<panel.string name="DateFmt">[day,datetime,utc]/[mthnum,datetime,utc]/[year,datetime,utc], [hour,datetime,utc]:[min,datetime,utc]</panel.string>
+	<panel.string name="DateFmtAMPM">[day,datetime,utc]/[mthnum,datetime,utc]/[year,datetime,utc], [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]</panel.string>
 	<button name="profile_btn" tool_tip="Afficher les propriétés de l'objet"/>
 </panel>
--- a/indra/newview/skins/default/xui/it/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/it/panel_teleport_history_item.xml
@ -3,6 +3,9 @@
 	<panel.string name="DateFmt">
 		[day,datetime,utc].[mthnum,datetime,utc].[year,datetime,utc], [hour,datetime,utc]:[min,datetime,utc]
 	</panel.string>
+	<panel.string name="DateFmtAMPM">
+		[day,datetime,utc].[mthnum,datetime,utc].[year,datetime,utc], [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
+	</panel.string>
 	<layout_stack name="ls_item">
 		<layout_panel name="lp_date">
 			<text name="timestamp" value="01.01.2000 12:00"/>
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@ -6621,17 +6621,20 @@ Assistenza nel sito SecondLife.com e segnala il problema.
 	<string name="GroupNoticesPanelDateString">
 		[day,datetime,local]/[mthnum,datetime,local]/[year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
 	</string>
+	<string name="GroupNoticesPanelDateStringAMPM">
+		[day,datetime,local]/[mthnum,datetime,local]/[year,datetime,local] [hour12,datetime,local]:[min,datetime,local]:[second,datetime,local] [timezone,datetime,local]
+	</string>
 	<string name="GroupNoticesToastDateString">
 		[wkday,datetime,slt] [day,datetime,slt]/[mth,datetime,slt]/[year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [timezone,datetime,slt]
 	</string>
-	<string name="NotificationItemDateStringLocal">
-		[day,datetime,local]/[mthnum,datetime,local]/[year,datetime,local] [hour,datetime,local]:[min,datetime,local]
+	<string name="GroupNoticesToastDateStringAMPM">
+		[wkday,datetime,slt] [day,datetime,slt]/[mth,datetime,slt]/[year,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [ampm,datetime,local] [timezone,datetime,slt]
 	</string>
-	<string name="NotificationItemDateStringUTC">
+	<string name="NotificationItemDateString">
 		[day,datetime,utc]/[mth,datetime,utc]/[year,datetime,utc] [hour,datetime,utc]:[min,datetime,utc] [timezone,datetime,utc]
 	</string>
-	<string name="NotificationItemDateStringSLT">
-		[day,datetime,slt]/[mthnum,datetime,slt]/[year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt] [timezone,datetime,slt]
+	<string name="NotificationItemDateStringAMPM">
+		[day,datetime,utc]/[mth,datetime,utc]/[year,datetime,utc] [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] [timezone,datetime,utc]
 	</string>
 	<string name="Pie_av_render_normally">
 		Normalmente
--- a/indra/newview/skins/default/xui/pl/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/pl/panel_teleport_history_item.xml
@ -3,6 +3,9 @@
 	<panel.string name="DateFmt">
 		[day,datetime,utc].[mthnum,datetime,utc].[year,datetime,utc], [hour,datetime,utc]:[min,datetime,utc]
 	</panel.string>
+	<panel.string name="DateFmtAMPM">
+		[day,datetime,utc].[mthnum,datetime,utc].[year,datetime,utc], [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
+	</panel.string>
 	<layout_stack name="ls_item">
 		<layout_panel name="lp_date">
 			<text name="timestamp" value="01.01.2000 12:00"/>
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@ -6579,17 +6579,20 @@ Twoja aktualna pozycja: [AVATAR_POS]
 	<string name="GroupNoticesPanelDateString">
 		[day,datetime,local].[mthnum,datetime,local].[year,datetime,local], [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
 	</string>
+	<string name="GroupNoticesPanelDateStringAMPM">
+		[day,datetime,local].[mthnum,datetime,local].[year,datetime,local], [hour12,datetime,local]:[min,datetime,local]:[second,datetime,local] [timezone,datetime,local]
+	</string>
 	<string name="GroupNoticesToastDateString">
 		[wkday,datetime,slt]., [day,datetime,slt].[mth,datetime,slt].[year,datetime,slt], [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [timezone,datetime,slt]
 	</string>
-	<string name="NotificationItemDateStringLocal">
-		[day,datetime,local].[mthnum,datetime,local].[year,datetime,local], [hour,datetime,local]:[min,datetime,local]
+	<string name="GroupNoticesToastDateStringAMPM">
+		[wkday,datetime,slt]., [day,datetime,slt].[mth,datetime,slt].[year,datetime,slt], [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [ampm,datetime,local] [timezone,datetime,slt]
 	</string>
-	<string name="NotificationItemDateStringUTC">
+	<string name="NotificationItemDateString">
 		[day,datetime,utc].[mth,datetime,utc].[year,datetime,utc], [hour,datetime,utc]:[min,datetime,utc] [timezone,datetime,utc]
 	</string>
-	<string name="NotificationItemDateStringSLT">
-		[day,datetime,slt].[mthnum,datetime,slt].[year,datetime,slt], [hour,datetime,slt]:[min,datetime,slt] [timezone,datetime,slt]
+	<string name="NotificationItemDateStringAMPM">
+		[day,datetime,utc].[mth,datetime,utc].[year,datetime,utc], [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] [timezone,datetime,utc]
 	</string>
 	<string name="Pie_av_render_normally">
 		Normalnie
--- a/indra/newview/skins/default/xui/ru/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/ru/panel_teleport_history_item.xml
@ -3,6 +3,9 @@
 	<panel.string name="DateFmt">
 		[day,datetime,utc].[mthnum,datetime,utc].[year,datetime,utc] [hour,datetime,utc]:[min,datetime,utc]
 	</panel.string>
+	<panel.string name="DateFmtAMPM">
+		[day,datetime,utc].[mthnum,datetime,utc].[year,datetime,utc] [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
+	</panel.string>
 	<layout_stack name="ls_item">
 		<layout_panel name="lp_date">
 			<text name="timestamp" value="01.01.2000 12:00"/>
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@ -6815,17 +6815,20 @@ ID объекта: [INSPECTING_KEY]
 	<string name="GroupNoticesPanelDateString">
 		[day,datetime,local].[mthnum,datetime,local].[year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
 	</string>
+	<string name="GroupNoticesPanelDateStringAMPM">
+		[day,datetime,local].[mthnum,datetime,local].[year,datetime,local] [hour12,datetime,local]:[min,datetime,local]:[second,datetime,local] [timezone,datetime,local]
+	</string>
 	<string name="GroupNoticesToastDateString">
 		[wkday,datetime,slt], [day,datetime,slt] [mth,datetime,slt] [year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [timezone,datetime,slt]
 	</string>
-	<string name="NotificationItemDateStringLocal">
-		[day,datetime,local].[mthnum,datetime,local].[year,datetime,local] [hour,datetime,local]:[min,datetime,local]
+	<string name="GroupNoticesToastDateStringAMPM">
+		[wkday,datetime,slt], [day,datetime,slt] [mth,datetime,slt] [year,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [ampm,datetime,local] [timezone,datetime,slt]
 	</string>
-	<string name="NotificationItemDateStringUTC">
+	<string name="NotificationItemDateString">
 		[day,datetime,utc] [mth,datetime,utc] [year,datetime,utc] [hour,datetime,utc]:[min,datetime,utc] [timezone,datetime,utc]
 	</string>
-	<string name="NotificationItemDateStringSLT">
-		[day,datetime,slt].[mthnum,datetime,slt].[year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt] [timezone,datetime,slt]
+	<string name="NotificationItemDateStringAMPM">
+		[day,datetime,utc] [mth,datetime,utc] [year,datetime,utc] [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] [timezone,datetime,utc]
 	</string>
 	<string name="Pie_av_render_normally">
 		Обычно
--- a/indra/newview/tests/llworldmap_test.cpp
+++ b/indra/newview/tests/llworldmap_test.cpp
@ -32,6 +32,7 @@
 #include "lltrans.h"
 #include "lluistring.h"
 #include "../llviewertexture.h"
+#include "../llviewercontrol.h"
 #include "../llworldmapmessage.h"
 // Class to test
 #include "../llworldmap.h"
@ -71,6 +72,11 @@ void LLUIString::updateResult() const { }
 void LLUIString::setArg(const std::string& , const std::string& ) { }
 void LLUIString::assign(const std::string& ) { }

+LLControlGroup::LLControlGroup(const std::string& name) : LLInstanceTracker<LLControlGroup, std::string>(name) {}
+LLControlGroup::~LLControlGroup() {}
+bool LLControlGroup::getBOOL(std::string_view) { return true; }
+LLControlGroup gSavedSettings("test_settings");
+
 // End Stubbing
 // -------------------------------------------------------------------------------------------