diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-04-02 13:25:08 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-04-02 13:25:08 -0400 |
| commit | 7049485ebd0b997a097c12e094425d58db56e043 (patch) | |
| tree | abe4e31d465e5ecacfa2bab2e76486ccd00a30f9 /indra/newview/scripts | |
| parent | 1866d1a450b7857da82ceafbd2c6581d87b7f334 (diff) | |
Fix std::filesystem::path - to - std::string conversions on Windows.
On Windows, std::filesystem::path::value_type is wchar_t, not char -- so
path::string_type is std::wstring, not std::string. So while Posix path
instances implicitly convert to string, Windows path instances do not. Add
explicit u8string() calls.
Also add LL.abspath() Lua entry point to further facilitate finding a resource
file relative to the calling Lua script. Use abspath() for both
test_luafloater_demo.lua and test_luafloater_gesture_list.lua.
Diffstat (limited to 'indra/newview/scripts')
| -rw-r--r-- | indra/newview/scripts/lua/test_luafloater_demo.lua | 2 | ||||
| -rw-r--r-- | indra/newview/scripts/lua/test_luafloater_gesture_list.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/scripts/lua/test_luafloater_demo.lua b/indra/newview/scripts/lua/test_luafloater_demo.lua index c2d16d4f88..ab638dcdd1 100644 --- a/indra/newview/scripts/lua/test_luafloater_demo.lua +++ b/indra/newview/scripts/lua/test_luafloater_demo.lua @@ -1,4 +1,4 @@ -XML_FILE_PATH = LL.source_dir() .. "/luafloater_demo.xml" +XML_FILE_PATH = LL.abspath("luafloater_demo.xml") scriptparts = string.split(LL.source_path(), '/') scriptname = scriptparts[#scriptparts] diff --git a/indra/newview/scripts/lua/test_luafloater_gesture_list.lua b/indra/newview/scripts/lua/test_luafloater_gesture_list.lua index a907eb2e90..3d9a9b0ad4 100644 --- a/indra/newview/scripts/lua/test_luafloater_gesture_list.lua +++ b/indra/newview/scripts/lua/test_luafloater_gesture_list.lua @@ -1,4 +1,4 @@ -XML_FILE_PATH = LL.source_dir() .. "/luafloater_gesture_list.xml" +XML_FILE_PATH = LL.abspath("luafloater_gesture_list.xml") scriptparts = string.split(LL.source_path(), '/') scriptname = scriptparts[#scriptparts] |