From 6ac30b3dbc38985559a21ad800a26e8e4cea2e88 Mon Sep 17 00:00:00 2001
From: Vincent Sylvester <vincentsylvester@zetamex.com>
Date: Wed, 6 Nov 2024 01:30:52 +0100
Subject: [PATCH] FIRE-34775: For OpenSim switch back to PST/PDT

---
 indra/llcommon/llstring.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index bcd5e30b1e..57faba4e51 100644
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -31,6 +31,7 @@
 #include "llfasttimer.h"
 #include "llsd.h"
 #include <vector>
+#include "llviewernetwork.h" // <FS/> Access to GridManager
 
 #if LL_WINDOWS
 #include "llwin32headers.h"
@@ -1628,12 +1629,17 @@ bool LLStringUtil::formatDatetime(std::string& replacement, std::string token,
         }
         else
         {
-#if 0
+// FIRE-34775 : Switch back to PST/PDT
+#ifdef OPENSIM
             // 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
-            replacement = LLStringOps::getPacificDaylightTime() ? "PDT" : "PST";
+            if (LLGridManager::getInstance()->isInSecondLife()) {
+               replacement = "SLT";
+            } else {
+               replacement = LLStringOps::getPacificDaylightTime() ? "PDT" : "PST";
+            }
 #else
             // SL-20370 : Steeltoe Linden : 29/Sep/23
             // Change "PDT" to "SLT" on menu bar