diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-09-26 09:00:48 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-09-26 09:00:48 -0400 |
commit | 988a0fdd1eedab24677ed517942a4ef20c830f08 (patch) | |
tree | 5cab73dee1e830afa89cc008c207525a1c742017 /indra/newview | |
parent | dc0c6d396eb70392f294eea65975646dad662f6a (diff) |
Fix a few more fsyspath conversions, removing explicit u8string().
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/tests/llluamanager_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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)) |