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/newview/llfloater360capture.cpp | |
| 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/newview/llfloater360capture.cpp')
| -rw-r--r-- | indra/newview/llfloater360capture.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/indra/newview/llfloater360capture.cpp b/indra/newview/llfloater360capture.cpp index ff30c83f51..f2345f5c01 100644 --- a/indra/newview/llfloater360capture.cpp +++ b/indra/newview/llfloater360capture.cpp @@ -33,6 +33,7 @@ #include "llagentui.h" #include "llbase64.h" #include "llcallbacklist.h" +#include "lldate.h" #include "llenvironment.h" #include "llimagejpeg.h" #include "llmediactrl.h" @@ -863,15 +864,7 @@ const std::string LLFloater360Capture::generate_proposed_filename() filename << "_"; // add in the current HH-MM-SS (with leading 0's) so users can easily save many shots in same folder - std::time_t cur_epoch = std::time(nullptr); - std::tm* tm_time = std::localtime(&cur_epoch); - filename << std::setfill('0') << std::setw(4) << (tm_time->tm_year + 1900); - filename << std::setfill('0') << std::setw(2) << (tm_time->tm_mon + 1); - filename << std::setfill('0') << std::setw(2) << tm_time->tm_mday; - filename << "_"; - filename << std::setfill('0') << std::setw(2) << tm_time->tm_hour; - filename << std::setfill('0') << std::setw(2) << tm_time->tm_min; - filename << std::setfill('0') << std::setw(2) << tm_time->tm_sec; + filename << LLDate::now().toLocalDateString("%Y%m%d_%H%M%S"); // the unusual way we save the output image (originates in the // embedded browser and not the C++ code) means that the system |