MAINT-6665 [Contribution] Viewer crashes when setting a local texture from a path containing non-standard characters
parent
93617deff7
commit
d6b0db5118
|
|
@ -1030,6 +1030,7 @@ Nicky Dasmijn
|
|||
OPEN-187
|
||||
STORM-2010
|
||||
STORM-2082
|
||||
MAINT-6665
|
||||
Nicky Perian
|
||||
OPEN-1
|
||||
STORM-1087
|
||||
|
|
|
|||
|
|
@ -181,7 +181,12 @@ bool LLLocalBitmap::updateSelf(EUpdateType optional_firstupdate)
|
|||
if (gDirUtilp->fileExists(mFilename))
|
||||
{
|
||||
// verifying that the file has indeed been modified
|
||||
|
||||
#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
|
||||
LLSD new_last_modified = asctime(localtime(&temp_time));
|
||||
|
||||
if (mLastModified.asString() != new_last_modified.asString())
|
||||
|
|
|
|||
Loading…
Reference in New Issue