diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-04-25 09:13:23 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-04-25 09:13:23 -0400 |
| commit | f162693a23fe5cfda8dab3857718624033812d30 (patch) | |
| tree | 0768f9ea570b248b48e4caa33103e3d55c625466 /indra/newview/llfilepicker.h | |
| parent | d8931c9269a90cd01f6f6ff4de83b8fb41df11d3 (diff) | |
| parent | d98fc504a1d4bc292ba86acdda053c8b4598a193 (diff) | |
Merge Maint YZ branch 'main' into DRTVWR-588-cleanup-timers
Diffstat (limited to 'indra/newview/llfilepicker.h')
| -rw-r--r-- | indra/newview/llfilepicker.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llfilepicker.h b/indra/newview/llfilepicker.h index 692b908fff..38daff9937 100644 --- a/indra/newview/llfilepicker.h +++ b/indra/newview/llfilepicker.h @@ -77,6 +77,7 @@ public: FFLOAD_WAV = 2, FFLOAD_IMAGE = 3, FFLOAD_ANIM = 4, + FFLOAD_GLTF = 5, FFLOAD_XML = 6, FFLOAD_SLOBJECT = 7, FFLOAD_RAW = 8, @@ -85,7 +86,9 @@ public: FFLOAD_SCRIPT = 11, FFLOAD_DICTIONARY = 12, FFLOAD_DIRECTORY = 13, // To call from lldirpicker. - FFLOAD_EXE = 14 // Note: EXE will be treated as ALL on Windows and Linux but not on Darwin + FFLOAD_EXE = 14, // Note: EXE will be treated as ALL on Windows and Linux but not on Darwin + FFLOAD_MATERIAL = 15, + FFLOAD_MATERIAL_TEXTURE = 16, }; enum ESaveFilter @@ -96,6 +99,7 @@ public: FFSAVE_BMP = 5, FFSAVE_AVI = 6, FFSAVE_ANIM = 7, + FFSAVE_GLTF = 8, FFSAVE_XML = 9, FFSAVE_COLLADA = 10, FFSAVE_RAW = 11, |