diff options
author | James Cook <james@lindenlab.com> | 2009-10-30 16:37:39 -0400 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-10-30 16:37:39 -0400 |
commit | c6c90642739b5b482c6347ddb816789d23b6a3aa (patch) | |
tree | 5695bcc8734bc2f78970426a8df5c61462f1b026 /indra/llcommon | |
parent | 31eac6e0eeae507a13a23a9116c87eb815ab8141 (diff) |
EXT-1565 Menu bar clock now shows Pacific (PDT/PST) time, as does any other
UI widget that references "slt" in the XML.
Diffstat (limited to 'indra/llcommon')
-rw-r--r-- | indra/llcommon/llstring.cpp | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp index f2edd5c559..721e5670e7 100644 --- a/indra/llcommon/llstring.cpp +++ b/indra/llcommon/llstring.cpp @@ -963,30 +963,29 @@ bool LLStringUtil::formatDatetime(std::string& replacement, std::string token, // if never fell into those two ifs above, param must be utc if (secFromEpoch < 0) secFromEpoch = 0; - LLDate * datetime = new LLDate((F64)secFromEpoch); + LLDate datetime((F64)secFromEpoch); std::string code = LLStringOps::getDatetimeCode (token); // special case to handle timezone if (code == "%Z") { if (param == "utc") + { replacement = "GMT"; - else if (param == "slt") - replacement = "SLT"; - else if (param != "local") // *TODO Vadim: not local? then what? + } + else if (param == "local") + { + replacement = ""; // user knows their own timezone + } + else + { + // "slt" = Second Life Time, which is deprecated. + // If not utc or user local time, fallback to Pacific time replacement = LLStringOps::getDaylightSavings() ? "PDT" : "PST"; - - return true; - } - replacement = datetime->toHTTPDateString(code); - - if (code.empty()) - { - return false; - } - else - { + } return true; } + replacement = datetime.toHTTPDateString(code); + return !code.empty(); } // LLStringUtil::format recogizes the following patterns. |