3 files changed, 6 insertions, 6 deletions
diff --git a/indra/llcommon/lua_function.cpp b/indra/llcommon/lua_function.cpp
index e28c0caa27..de06dab264 100644
--- a/indra/llcommon/lua_function.cpp
+++ b/indra/llcommon/lua_function.cpp
@@ -1119,7 +1119,7 @@ lua_function(source_dir, "source_dir(): return the source directory of the runni
 {
     lua_checkdelta(L, 1);
     lluau_checkstack(L, 1);
-    lua_pushstdstring(L, lluau::source_path(L).parent_path());
+    lua_pushstdstring(L, fsyspath(lluau::source_path(L).parent_path()));
     return 1;
 }
 
@@ -1132,7 +1132,7 @@ lua_function(abspath, "abspath(path): "
     lua_checkdelta(L);
     auto path{ lua_tostdstring(L, 1) };
     lua_pop(L, 1);
-    lua_pushstdstring(L, (lluau::source_path(L).parent_path() / path));
+    lua_pushstdstring(L, fsyspath(lluau::source_path(L).parent_path() / path));
     return 1;
 }
 
diff --git a/indra/llui/llluafloater.cpp b/indra/llui/llluafloater.cpp
index 83e4c9c983..91c0cfeec9 100644
--- a/indra/llui/llluafloater.cpp
+++ b/indra/llui/llluafloater.cpp
@@ -301,7 +301,7 @@ void LLLuaFloater::postEvent(LLSD data, const std::string &event_name)
 void LLLuaFloater::showLuaFloater(const LLSD &data)
 {
     fsyspath fs_path(data["xml_path"].asString());
-    std::string path = fs_path.lexically_normal();
+    fsyspath path = fs_path.lexically_normal();
     if (!fs_path.is_absolute())
     {
         std::string lib_path = gDirUtilp->getExpandedFilename(LL_PATH_SCRIPTS, "lua");
diff --git a/indra/newview/tests/llluamanager_test.cpp b/indra/newview/tests/llluamanager_test.cpp
index f0a1b32eed..9687b68451 100644
--- a/indra/newview/tests/llluamanager_test.cpp
+++ b/indra/newview/tests/llluamanager_test.cpp
@@ -55,14 +55,14 @@ namespace tut
             // indra/newview/tests/llluamanager_test.cpp =>
             // indra/newview
             auto newview{ fsyspath(__FILE__).parent_path().parent_path() };
-            auto settings{ newview / "app_settings" / "settings.xml" };
+            fsyspath settings{ newview / "app_settings" / "settings.xml" };
             // true suppresses implicit declare; implicit declare requires
             // that every variable in settings.xml has a Comment, which many don't.
-            gSavedSettings.loadFromFile(settings.u8string(), true);
+            gSavedSettings.loadFromFile(settings, true);
             // At test time, since we don't have the app bundle available,
             // extend LuaRequirePath to include the require directory in the
             // source tree.
-            auto require{ (newview / "scripts" / "lua" / "require").u8string() };
+            std::string require{ fsyspath(newview / "scripts" / "lua" / "require") };
             auto paths{ gSavedSettings.getLLSD("LuaRequirePath") };
             bool found = false;
             for (const auto& path : llsd::inArray(paths))