diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2016-08-26 17:02:32 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2016-08-26 17:02:32 +0300 |
| commit | d6b0db5118788106087ec2e5743fd10110fdb470 (patch) | |
| tree | 325b7e09b7bebcfb82032fe7f31e2556bac45a2a | |
| parent | 93617deff787be7a34a3ecd5a06a8aa95ed19b1b (diff) | |
MAINT-6665 [Contribution] Viewer crashes when setting a local texture from a path containing non-standard characters
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/lllocalbitmaps.cpp | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 917fcf14f6..05fb19aaf0 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1030,6 +1030,7 @@ Nicky Dasmijn OPEN-187 STORM-2010 STORM-2082 + MAINT-6665 Nicky Perian OPEN-1 STORM-1087 diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp index aa934f95a1..a55938f334 100644 --- a/indra/newview/lllocalbitmaps.cpp +++ b/indra/newview/lllocalbitmaps.cpp @@ -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()) |