diff options
| author | Callum Prentice <callum@lindenlab.com> | 2023-07-18 10:51:51 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2023-07-18 10:51:51 -0700 |
| commit | c5d7f3c4c1cf37ca0e68bbe9830bd3f3931476e5 (patch) | |
| tree | c2af269fd56c04bb9ddca3d99a0cd68ab9d6c94e /indra/newview/llviewermenufile.cpp | |
| parent | 1fe007abef6eeceefb0dc720b4a5ecb4505ede88 (diff) | |
| parent | ec4135da63a3f3877222fba4ecb59b15650371fe (diff) | |
DRTVWR-489: trivial merge conflict fix
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 27fe7a7018..2634c8d908 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -355,9 +355,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 @@ -379,10 +376,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: |