From d05708f4b33de6d29b064d5b2a4a398dfc725015 Mon Sep 17 00:00:00 2001 From: Nicky Date: Wed, 17 Aug 2016 22:45:57 +0200 Subject: [PATCH] FIRE-19855; use wide character path name for windows. --- indra/newview/lllocalbitmaps.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp index c34df1cc02..292a93dea4 100644 --- a/indra/newview/lllocalbitmaps.cpp +++ b/indra/newview/lllocalbitmaps.cpp @@ -186,8 +186,11 @@ bool LLLocalBitmap::updateSelf(EUpdateType optional_firstupdate) // const std::time_t temp_time = boost::filesystem::last_write_time(boost::filesystem::path(mFilename)); - std::string strFName = nd::aprhelper::ndConvertFilename( mFilename ); - const std::time_t temp_time = boost::filesystem::last_write_time(boost::filesystem::path( strFName ) ); +#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 ) ) ); +#endif //