diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2026-03-04 17:27:20 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <118752495+marchcat@users.noreply.github.com> | 2026-03-04 19:12:44 +0200 |
| commit | 2d77fdc672f52f36e511af52ae5b1f678799171d (patch) | |
| tree | ee85b1192093d851b6987c8c9dbf831fcfacd223 /indra/newview/llfilepicker.cpp | |
| parent | 189e9d83d675e8bdb9f61978f0e25aaa19e7a041 (diff) | |
#5430 Allow `.lua` and `.luau` extensions in "Load from file"
Diffstat (limited to 'indra/newview/llfilepicker.cpp')
| -rw-r--r-- | indra/newview/llfilepicker.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index 2c5c6900d3..20b99393fd 100644 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -63,7 +63,7 @@ LLFilePicker LLFilePicker::sInstance; #define MATERIAL_FILTER L"GLTF Files (*.gltf; *.glb)\0*.gltf;*.glb\0" #define HDRI_FILTER L"HDRI Files (*.exr)\0*.exr\0" #define MATERIAL_TEXTURES_FILTER L"GLTF Import (*.gltf; *.glb; *.tga; *.bmp; *.jpg; *.jpeg; *.png)\0*.gltf;*.glb;*.tga;*.bmp;*.jpg;*.jpeg;*.png\0" -#define SCRIPT_FILTER L"Script files (*.lsl)\0*.lsl\0" +#define SCRIPT_FILTER L"Script files (*.lsl; *.lua; *.luau)\0*.lsl;*.lua;*.luau\0" #define DICTIONARY_FILTER L"Dictionary files (*.dic; *.xcu)\0*.dic;*.xcu\0" #endif @@ -225,7 +225,7 @@ namespace filter_vec.push_back({ "HDRI Files (*.exr)", "exr" }); break; case LLFilePicker::FFLOAD_SCRIPT: - filter_vec.push_back({ "Script files (*.lsl)", "lsl" }); + filter_vec.push_back({ "Script files (*.lsl; *.lua; *.luau)", "lsl;lua;luau" }); break; case LLFilePicker::FFLOAD_DICTIONARY: filter_vec.push_back({ "Dictionary files (*.dic; *.xcu)", "dic;xcu" }); @@ -542,7 +542,7 @@ bool LLFilePicker::getSaveFileModeless(ESaveFilter filter, { default_filename = "untitled.lsl"; } - file_filters.push_back({ "LSL Files (*.lsl)", "lsl" }); + file_filters.push_back({ "Script files (*.lsl; *.lua; *.luau)", "lsl;lua;luau" }); break; default: return false; @@ -1131,6 +1131,8 @@ std::unique_ptr<std::vector<std::string>> LLFilePicker::navOpenFilterProc(ELoadF break; case FFLOAD_SCRIPT: allowedv->push_back("lsl"); + allowedv->push_back("lua"); + allowedv->push_back("luau"); break; case FFLOAD_DICTIONARY: allowedv->push_back("dic"); @@ -1264,7 +1266,7 @@ void set_nav_save_data(LLFilePicker::ESaveFilter filter, std::string &extension, case LLFilePicker::FFSAVE_SCRIPT: type = "LSL "; creator = "\?\?\?\?"; - extension = "lsl"; + extension = "lsl;lua;luau"; break; case LLFilePicker::FFSAVE_ALL: |
