diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-01-04 14:43:45 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-01-04 14:43:45 -0500 |
| commit | 197a1ddef8a0b7bc7872339ec82b2a5bc5cbb3b4 (patch) | |
| tree | 31b2bf3eeb026334ed20cd6e4f8fb15f91a07b0f /indra/newview/llfilepicker.h | |
| parent | 5a6174c0853f5a140343725312f2b63b42f2bbad (diff) | |
| parent | a592292242e29d0379ee72572a434359e1e892d1 (diff) | |
DRTVWR-589: Merge branch 'main' into DRTVWR-589
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 cb453ea87e..f00f076d1c 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, @@ -86,7 +87,9 @@ public: 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_LUA = 15 + FFLOAD_MATERIAL = 15, + FFLOAD_MATERIAL_TEXTURE = 16, + FFLOAD_LUA = 17, }; enum ESaveFilter @@ -97,6 +100,7 @@ public: FFSAVE_BMP = 5, FFSAVE_AVI = 6, FFSAVE_ANIM = 7, + FFSAVE_GLTF = 8, FFSAVE_XML = 9, FFSAVE_COLLADA = 10, FFSAVE_RAW = 11, |