From d6b0db5118788106087ec2e5743fd10110fdb470 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 26 Aug 2016 17:02:32 +0300
Subject: [PATCH] MAINT-6665 [Contribution] Viewer crashes when setting a local
texture from a path containing non-standard characters
---
doc/contributions.txt | 1 +
indra/newview/lllocalbitmaps.cpp | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 917fcf14f63..05fb19aaf0a 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 aa934f95a1e..a55938f334d 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())
--
GitLab