diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-09-07 08:43:44 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-09-07 08:47:07 +0800 |
| commit | 3c760b9da437a0b8a99e77d9e60493036ce16b0c (patch) | |
| tree | 84232369d5b1b7423a58dcc9e9a4fbc53a4d69b8 /indra/llprimitive | |
| parent | a160ac9d8531f1702ad60a196d0d1914a0f683b9 (diff) | |
BSD/Linux can use the same dae loader construction
Also add explicit minizip, pcre, and xml2 development packages in
Debian/Ubuntu instructions.
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/lldaeloader.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
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<domCOLLADA *>(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<domCOLLADA *>(dae.open(uri_filename)); -#else dom = dae.open(uri_filename); -#endif } if (!dom) |