diff options
author | Erik Kundiman <erik@megapahit.org> | 2025-06-24 17:25:38 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2025-06-24 17:25:38 +0800 |
commit | c8bd92305a7c09f70eb7d3861ccce61972fd1473 (patch) | |
tree | 4921f3384b316733d62ccd22826d6bd69954c844 /indra/newview/llfilepicker.cpp | |
parent | a20bf9a72365142e6a534180c375221c100d7c54 (diff) | |
parent | bd7e79df36f8bf473bd6332eda7f1def5b9aaad7 (diff) |
Merge tag 'Second_Life_Project#bd7e79df-gltf_mesh_import' into gltf_mesh_import
Diffstat (limited to 'indra/newview/llfilepicker.cpp')
-rw-r--r-- | indra/newview/llfilepicker.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index 66e19d551e..9e19d16957 100644 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -222,6 +222,8 @@ bool LLFilePicker::setupFilter(ELoadFilter filter) break; case FFLOAD_MODEL: mOFN.lpstrFilter = MODEL_FILTER \ + COLLADA_FILTER \ + MATERIAL_FILTER \ L"\0"; break; case FFLOAD_MATERIAL: |