diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2022-06-08 20:46:33 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2022-06-08 20:46:33 +0000 |
| commit | 4ee387f971019fe4e2a5fce1578ba77387f1b7e1 (patch) | |
| tree | 0dd38cb047775a639a9f6df264caf67287f004c7 /indra/newview/llviewermenufile.cpp | |
| parent | d385c73b6e6df968a19a2bb7f0ec1e72bd01e8dc (diff) | |
| parent | d3219f57c12ec29025e5c9c68b2cf90d49258672 (diff) | |
Merged in euclid-gltf-17214 (pull request #1013)
Add tinygltf import library, and partial gltf loader implementation.
Approved-by: Brad Kittenbrink
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 28ff69eaf5..32fdfe282d 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -277,9 +277,6 @@ void LLMediaFilePicker::notify(const std::vector<std::string>& filenames) static std::string SOUND_EXTENSIONS = "wav"; static std::string IMAGE_EXTENSIONS = "tga bmp jpg jpeg png"; static std::string ANIM_EXTENSIONS = "bvh anim"; -#ifdef _CORY_TESTING -static std::string GEOMETRY_EXTENSIONS = "slg"; -#endif static std::string XML_EXTENSIONS = "xml"; static std::string SLOBJECT_EXTENSIONS = "slobject"; #endif @@ -301,10 +298,6 @@ std::string build_extensions_string(LLFilePicker::ELoadFilter filter) return SLOBJECT_EXTENSIONS; case LLFilePicker::FFLOAD_MODEL: return MODEL_EXTENSIONS; -#ifdef _CORY_TESTING - case LLFilePicker::FFLOAD_GEOMETRY: - return GEOMETRY_EXTENSIONS; -#endif case LLFilePicker::FFLOAD_XML: return XML_EXTENSIONS; case LLFilePicker::FFLOAD_ALL: |