diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-07-18 12:18:35 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-07-18 12:18:35 -0500 |
| commit | 5797711cbdb553b39e6bc6ad7d9250e3208e5633 (patch) | |
| tree | 5071e15e3240c3e39fe42a26f4c45bd63ccb381a /indra/newview/llfilepicker.cpp | |
| parent | a0089c432ac9008f5d2f7ef2a332afa10c5a2615 (diff) | |
| parent | f9f5b538b21ae57f34009b36d4831d2a7000c20c (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llfilepicker.cpp')
| -rw-r--r-- | indra/newview/llfilepicker.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index c2667bedaa..4ad136e13a 100644 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -194,11 +194,11 @@ BOOL LLFilePicker::setupFilter(ELoadFilter filter) mOFN.lpstrFilter = ANIM_FILTER \ L"\0"; break; - case FFLOAD_GLTF: - mOFN.lpstrFilter = GLTF_FILTER \ - L"\0"; - break; - case FFLOAD_COLLADA: + case FFLOAD_GLTF: + mOFN.lpstrFilter = GLTF_FILTER \ + L"\0"; + break; + case FFLOAD_COLLADA: mOFN.lpstrFilter = COLLADA_FILTER \ L"\0"; break; @@ -780,7 +780,6 @@ void set_nav_save_data(LLFilePicker::ESaveFilter filter, std::string &extension, creator = "\?\?\?\?"; extension = "xaf"; break; - case LLFilePicker::FFSAVE_GLTF: type = "\?\?\?\?"; creator = "\?\?\?\?"; |
