diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2022-05-26 11:18:44 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2022-05-26 11:18:44 -0600 |
| commit | 02c71b0ac2f99dd1c26a649ffce2182b2fc9a7d9 (patch) | |
| tree | 4255c2827cc3e07921275bfd7937f4f43f29d5fa /indra/llcommon/lldate.cpp | |
| parent | 3f58ec2fdfb76ce2160884a3e97be49f60b6ac90 (diff) | |
| parent | cdbd06e8ed6e3f4285a61f5c0b607a65dfdf8dfd (diff) | |
Merge branch 'master' v 6.6.1 into DRTVWR-528
Diffstat (limited to 'indra/llcommon/lldate.cpp')
| -rw-r--r-- | indra/llcommon/lldate.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llcommon/lldate.cpp b/indra/llcommon/lldate.cpp index 7a2a0869f4..2ddcf40895 100644 --- a/indra/llcommon/lldate.cpp +++ b/indra/llcommon/lldate.cpp @@ -86,11 +86,9 @@ std::string LLDate::asRFC1123() const return toHTTPDateString (std::string ("%A, %d %b %Y %H:%M:%S GMT")); } -LLTrace::BlockTimerStatHandle FT_DATE_FORMAT("Date Format"); - std::string LLDate::toHTTPDateString (std::string fmt) const { - LL_RECORD_BLOCK_TIME(FT_DATE_FORMAT); + LL_PROFILE_ZONE_SCOPED; time_t locSeconds = (time_t) mSecondsSinceEpoch; struct tm * gmt = gmtime (&locSeconds); @@ -99,7 +97,7 @@ std::string LLDate::toHTTPDateString (std::string fmt) const std::string LLDate::toHTTPDateString (tm * gmt, std::string fmt) { - LL_RECORD_BLOCK_TIME(FT_DATE_FORMAT); + LL_PROFILE_ZONE_SCOPED; // avoid calling setlocale() unnecessarily - it's expensive. static std::string prev_locale = ""; |