Merge branch 'release/luau-scripting' into lua-appearance-listener

1 files changed, 5 insertions, 0 deletions

diff --git a/indra/llcommon/fsyspath.h b/indra/llcommon/fsyspath.h
index aa4e0132bc..3c749d84de 100644
--- a/indra/llcommon/fsyspath.h
+++ b/indra/llcommon/fsyspath.h
@@ -69,6 +69,11 @@ public:
 
     // shadow base-class string() method with UTF-8 aware method
     std::string string() const { return super::u8string(); }
+    // On Posix systems, where value_type is already char, this operator
+    // std::string() method shadows the base class operator string_type()
+    // method. But on Windows, where value_type is wchar_t, the base class
+    // doesn't have operator std::string(). Provide it.
+    operator std::string() const { return string(); }
 };
 
 #endif /* ! defined(LL_FSYSPATH_H) */