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

Merge pull request #103 from Tampa/FIRE-34775 

FIRE-34775: For OpenSim switch back to PST/PDT
master
Beq Janus 2025-04-16 21:56:31 +01:00 committed by GitHub
parent e001d0f6e1 6ac30b3dbc
commit 0a1b7789c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llcommon/llstring.cpp
View File

@ -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