diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-09-18 15:23:26 -0400 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-09-18 15:23:26 -0400 |
| commit | 82e431e0906647dcfc4a64b057e6bc305c9add8e (patch) | |
| tree | 9a1431c0c311de41388879b31f26c6faa8bf5e89 /indra/newview/lllocalbitmaps.cpp | |
| parent | badeccbebcfa73a11cf0f8a4562c9a0d386834c1 (diff) | |
| parent | bf0f60039b33bb0b1f93431864fd6b51c2a20b5b (diff) | |
Merge remote-tracking branch 'origin/release/2025.07' into geenz/2025.07-develop
Diffstat (limited to 'indra/newview/lllocalbitmaps.cpp')
| -rw-r--r-- | indra/newview/lllocalbitmaps.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp index e31fbb188a..a99c9df0ff 100644 --- a/indra/newview/lllocalbitmaps.cpp +++ b/indra/newview/lllocalbitmaps.cpp @@ -196,7 +196,7 @@ bool LLLocalBitmap::updateSelf(EUpdateType optional_firstupdate) #ifndef LL_WINDOWS const std::time_t temp_time = boost::filesystem::last_write_time(boost::filesystem::path(mFilename)); #else - const std::time_t temp_time = boost::filesystem::last_write_time(boost::filesystem::path(utf8str_to_utf16str(mFilename))); + const std::time_t temp_time = boost::filesystem::last_write_time(boost::filesystem::path(ll_convert<std::wstring>(mFilename))); #endif LLSD new_last_modified = asctime(localtime(&temp_time)); |