From b460297081058d48a5927c9008f7e69e709916aa Mon Sep 17 00:00:00 2001 From: Beq Date: Wed, 16 Apr 2025 22:33:12 +0100 Subject: [PATCH] Revert "Merge pull request #103 from Tampa/FIRE-34775" This reverts commit 0a1b7789c74c488903bb85ea8a3f8ddf3020f46a, reversing changes made to e001d0f6e1149e401301031ead686b675fe6dba9. --- indra/llcommon/llstring.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp index 57faba4e51..bcd5e30b1e 100644 --- a/indra/llcommon/llstring.cpp +++ b/indra/llcommon/llstring.cpp @@ -31,7 +31,6 @@ #include "llfasttimer.h" #include "llsd.h" #include -#include "llviewernetwork.h" // Access to GridManager #if LL_WINDOWS #include "llwin32headers.h" @@ -1629,17 +1628,12 @@ bool LLStringUtil::formatDatetime(std::string& replacement, std::string token, } else { -// FIRE-34775 : Switch back to PST/PDT -#ifdef OPENSIM +#if 0 // EXT-1565 : Zai Lynch, James Linden : 15/Oct/09 // [BSI] Feedback: Viewer clock mentions SLT, but would prefer it to show PST/PDT // "slt" = Second Life Time, which is deprecated. // If not utc or user local time, fallback to Pacific time - if (LLGridManager::getInstance()->isInSecondLife()) { - replacement = "SLT"; - } else { - replacement = LLStringOps::getPacificDaylightTime() ? "PDT" : "PST"; - } + replacement = LLStringOps::getPacificDaylightTime() ? "PDT" : "PST"; #else // SL-20370 : Steeltoe Linden : 29/Sep/23 // Change "PDT" to "SLT" on menu bar