livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Merge pull request #103 from Tampa/FIRE-34775" 

This reverts commit 0a1b7789c7, reversing
changes made to e001d0f6e1.
master
Beq 2025-04-16 22:33:12 +01:00
parent 1f28648b8a
commit b460297081
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llcommon/llstring.cpp
View File

@ -31,7 +31,6 @@
#include "llfasttimer.h"
#include "llsd.h"
#include <vector>
#include "llviewernetwork.h" // <FS/> 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