diff --git a/doc/contributions.txt b/doc/contributions.txt
index 917fcf14f63dd691242593f6fd1122124cf25f94..05fb19aaf0a8f77e8af55f235835ac1d193fc5db 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 aa934f95a1ed3faedb434082deb11801de4a1fe5..a55938f334d12fe39ba911218dd72cb3fc582d26 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())