diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-03-02 18:37:19 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-03-02 18:37:19 -0600 |
| commit | 9464065503f62ac2603b8cb0089540aaa494d36c (patch) | |
| tree | 6fe7efe4f9f5859ae4a8b2808aed7ab18613cef7 /indra | |
| parent | 7139444461aae953a263a60f1a093070cc870225 (diff) | |
| parent | e72e4250c5df36e3a64395c336f29795c4ff8406 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfilepicker.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index 29e8210d8e..014c8a4d2d 100644 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -631,6 +631,7 @@ std::unique_ptr<std::vector<std::string>> LLFilePicker::navOpenFilterProc(ELoadF allowedv->push_back("anim"); break; case FFLOAD_GLTF: + case FFLOAD_MATERIAL: allowedv->push_back("gltf"); allowedv->push_back("glb"); break; |