Merge Changes for support of apple silicon on macOS

Mac Arm

1 files changed, 5 insertions, 2 deletions

diff --git a/indra/llfilesystem/lldirguard.h b/indra/llfilesystem/lldirguard.h
index fcb179bbc8..c6ce13efb4 100644
--- a/indra/llfilesystem/lldirguard.h
+++ b/indra/llfilesystem/lldirguard.h
@@ -31,6 +31,9 @@
 #include "llerror.h"
 
 #if LL_WINDOWS
+
+#include "llwin32headers.h"
+
 class LLDirectoryGuard
 {
 public:
@@ -46,8 +49,8 @@ public:
             (wcsncmp(mOrigDir,mFinalDir,mOrigDirLen)!=0))
         {
             // Dir has changed
-            std::string mOrigDirUtf8 = utf16str_to_utf8str(llutf16string(mOrigDir));
-            std::string mFinalDirUtf8 = utf16str_to_utf8str(llutf16string(mFinalDir));
+            std::string mOrigDirUtf8 = ll_convert<std::string>(std::wstring(mOrigDir));
+            std::string mFinalDirUtf8 = ll_convert<std::string>(std::wstring(mFinalDir));
             LL_INFOS() << "Resetting working dir from " << mFinalDirUtf8 << " to " << mOrigDirUtf8 << LL_ENDL;
             SetCurrentDirectory(mOrigDir);
         }