diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-09-07 18:01:01 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-09-07 18:02:44 +0800 |
| commit | 23b7628ac8bb43e1c3d33744df071b23c352f713 (patch) | |
| tree | d43ef958193f8b26fa282eb6adf60a8bdc3d21a3 /indra/llprimitive/lldaeloader.cpp | |
| parent | a742349cabd97b42e61e1b445f79840407cb3479 (diff) | |
| parent | 3aacb2ec3f49d82e99af516bef4cd547f55dc3e0 (diff) | |
Merge branch 'main' into 2024.08-DeltaFPS
Diffstat (limited to 'indra/llprimitive/lldaeloader.cpp')
| -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 544db36b50..34af3ffece 100644 --- a/indra/llprimitive/lldaeloader.cpp +++ b/indra/llprimitive/lldaeloader.cpp @@ -935,20 +935,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) |