From 3c760b9da437a0b8a99e77d9e60493036ce16b0c Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Sat, 7 Sep 2024 08:43:44 +0800 Subject: BSD/Linux can use the same dae loader construction Also add explicit minizip, pcre, and xml2 development packages in Debian/Ubuntu instructions. --- indra/llprimitive/lldaeloader.cpp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'indra') diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp index 56bf91bc22..43fb043363 100644 --- a/indra/llprimitive/lldaeloader.cpp +++ b/indra/llprimitive/lldaeloader.cpp @@ -941,20 +941,12 @@ bool LLDAELoader::OpenFile(const std::string& filename) domCOLLADA* dom; if (mPreprocessDAE) { -#if __FreeBSD__ || (LL_USESYSTEMLIBS && LL_LINUX) - dom = static_cast(dae.openFromMemory(uri_filename, preprocessDAE(filename).c_str())); -#else dom = dae.openFromMemory(uri_filename, preprocessDAE(filename).c_str()); -#endif } else { LL_INFOS() << "Skipping dae preprocessing" << LL_ENDL; -#if __FreeBSD__ || (LL_USESYSTEMLIBS && LL_LINUX) - dom = static_cast(dae.open(uri_filename)); -#else dom = dae.open(uri_filename); -#endif } if (!dom) -- cgit v1.2.3