diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 11:55:27 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 11:55:27 +0300 |
| commit | 1b19919eff1104f9f1ee97004420e91c45349e29 (patch) | |
| tree | a0b7c8b06bf198f1a138c181d086d8c26d11ad72 /indra/llcommon | |
| parent | 86bf599e2895b60c04fb688b9ad118c83e075be3 (diff) | |
| parent | 18f23d9a559d3b5ed61d4fc4d3cfa9fa6c50689c (diff) | |
Merge commit '18f23d9a55' into marchcat/c-develop
# Conflicts:
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llagent.cpp
# indra/newview/llavatarrenderinfoaccountant.cpp
# indra/newview/llcontrolavatar.cpp
# indra/newview/llinspecttexture.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvovolume.cpp
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/lldate.cpp | 9 | ||||
| -rw-r--r-- | indra/llcommon/lldate.h | 1 | ||||
| -rw-r--r-- | indra/llcommon/threadpool.h | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/indra/llcommon/lldate.cpp b/indra/llcommon/lldate.cpp index 5f51f40232..4ff56ae8c8 100644 --- a/indra/llcommon/lldate.cpp +++ b/indra/llcommon/lldate.cpp @@ -79,6 +79,15 @@ std::string LLDate::asRFC1123() const return toHTTPDateString (std::string ("%A, %d %b %Y %H:%M:%S GMT")); } +std::string LLDate::toLocalDateString (std::string fmt) const +{ + LL_PROFILE_ZONE_SCOPED; + + time_t locSeconds = (time_t) mSecondsSinceEpoch; + struct tm * lt = localtime (&locSeconds); + return toHTTPDateString(lt, fmt); +} + std::string LLDate::toHTTPDateString (std::string fmt) const { LL_PROFILE_ZONE_SCOPED; diff --git a/indra/llcommon/lldate.h b/indra/llcommon/lldate.h index 0afe0b0599..534b660689 100644 --- a/indra/llcommon/lldate.h +++ b/indra/llcommon/lldate.h @@ -79,6 +79,7 @@ public: std::string asRFC1123() const; void toStream(std::ostream&) const; bool split(S32 *year, S32 *month = NULL, S32 *day = NULL, S32 *hour = NULL, S32 *min = NULL, S32 *sec = NULL) const; + std::string toLocalDateString (std::string fmt) const; std::string toHTTPDateString (std::string fmt) const; static std::string toHTTPDateString (tm * gmt, std::string fmt); /** diff --git a/indra/llcommon/threadpool.h b/indra/llcommon/threadpool.h index 2748d7b073..dfd7df4290 100644 --- a/indra/llcommon/threadpool.h +++ b/indra/llcommon/threadpool.h @@ -56,7 +56,7 @@ namespace LL * ThreadPool listens for application shutdown events. Call close() to * shut down this ThreadPool early. */ - virtual void close(); + void close(); std::string getName() const { return mName; } size_t getWidth() const { return mThreads.size(); } |