summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2025-05-12 21:14:24 +0800
committerErik Kundiman <erik@megapahit.org>2025-05-12 21:19:11 +0800
commitabb32860d2a6e49e10d3ab243a62154d67f802b2 (patch)
tree0562eecc7df268e9cefef1b51172b7122ebf1d9e
parentd43c417a737d9f48fece51d084a85e3fad86382b (diff)
Not redeclare DOM/DAE classes in any condition
They haven't been used anyway because of LL_USESYSTEMLIBS (before), and it still works even though we reverted to using LL's fork in ColladaDOM's case, by building the fork instead of using any system library vanilla version.
-rw-r--r--indra/llprimitive/lldaeloader.h2
-rw-r--r--indra/llprimitive/llmodel.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llprimitive/lldaeloader.h b/indra/llprimitive/lldaeloader.h
index c6e5ea42fc..92152fb8b8 100644
--- a/indra/llprimitive/lldaeloader.h
+++ b/indra/llprimitive/lldaeloader.h
@@ -29,7 +29,7 @@
#include "llmodelloader.h"
-#ifndef LL_USESYSTEMLIBS
+#if 0
class DAE;
class daeElement;
class domProfile_COMMON;
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h
index 309c5df64c..4b5d079b48 100644
--- a/indra/llprimitive/llmodel.h
+++ b/indra/llprimitive/llmodel.h
@@ -35,7 +35,7 @@
#include <boost/align/aligned_allocator.hpp>
-#ifndef LL_USESYSTEMLIBS
+#if 0
class daeElement;
class domMesh;
#endif