diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-07-12 17:15:57 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-07-19 14:56:44 +0800 |
| commit | 08b0528312c8dc90c7564634909ef49752a4f90a (patch) | |
| tree | 41d35b03d601ef6145fa0671fe9df9443904809f /indra/llprimitive | |
| parent | 7f091b864e5ec8c574971cc4a839d95c52c26b58 (diff) | |
DAE class declarations are when not on system libs
cause they would cause ambiguity with system COLLADA DOM classes.
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/lldaeloader.h | 2 | ||||
| -rw-r--r-- | indra/llprimitive/llmodel.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/indra/llprimitive/lldaeloader.h b/indra/llprimitive/lldaeloader.h index 2b211343e1..e99fc51ee9 100644 --- a/indra/llprimitive/lldaeloader.h +++ b/indra/llprimitive/lldaeloader.h @@ -29,6 +29,7 @@ #include "llmodelloader.h" +#ifndef LL_USESYSTEMLIBS class DAE; class daeElement; class domProfile_COMMON; @@ -38,6 +39,7 @@ class domTranslate; class domController; class domSkin; class domMesh; +#endif class LLDAELoader : public LLModelLoader { diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h index 4505d6b3b9..6a4a4927b6 100644 --- a/indra/llprimitive/llmodel.h +++ b/indra/llprimitive/llmodel.h @@ -35,8 +35,10 @@ #include <boost/align/aligned_allocator.hpp> +#ifndef LL_USESYSTEMLIBS class daeElement; class domMesh; +#endif #define MAX_MODEL_FACES 8 |