From d604302d942d26ccfd8e0e5de548fa437d1425d5 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Fri, 30 Aug 2024 22:22:52 +0800 Subject: Fix Error: Dae parsing issue - see log for details https://megapahit.com/show_bug.cgi?id=76 It seems like we have to use LL's Collada DOM 2.3. Make sure minizip is installed on macOS. It should be safe to uninstall your system Collada DOM package now. The CMake arguments might have to be completed for non-Darwin platforms in a next commit. --- indra/llprimitive/lldaeloader.cpp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'indra/llprimitive') diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp index a099a07cbd..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) { -#ifdef LL_USESYSTEMLIBS - 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; -#ifdef LL_USESYSTEMLIBS - dom = static_cast(dae.open(uri_filename)); -#else dom = dae.open(uri_filename); -#endif } if (!dom) -- cgit v1.2.3