summaryrefslogtreecommitdiff
path: root/indra/llprimitive/lldaeloader.h
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2025-07-18 13:59:39 +0800
committerErik Kundiman <erik@megapahit.org>2025-07-18 13:59:39 +0800
commit50755dcf5f6d4c70c6b6815b2467dda61dc4dc5a (patch)
tree4db99c2b48408390dfffe6b39261311002c5e3ec /indra/llprimitive/lldaeloader.h
parent6daacd94d1f53e53417ac24f05b983a2600a964f (diff)
parentf5d350fb7bd51735ab2624262e841d614c6eadd8 (diff)
Merge tag 'Second_Life_Release#f5d350fb-2025.05-gltf-mesh-import' into 2025.05
Diffstat (limited to 'indra/llprimitive/lldaeloader.h')
-rw-r--r--indra/llprimitive/lldaeloader.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llprimitive/lldaeloader.h b/indra/llprimitive/lldaeloader.h
index b3e4667fd7..82eb76c8e9 100644
--- a/indra/llprimitive/lldaeloader.h
+++ b/indra/llprimitive/lldaeloader.h
@@ -61,6 +61,7 @@ public:
std::map<std::string, std::string, std::less<>>& jointAliasMap,
U32 maxJointsPerMesh,
U32 modelLimit,
+ U32 debugMode,
bool preprocess);
virtual ~LLDAELoader() ;
@@ -99,13 +100,12 @@ protected:
bool loadModelsFromDomMesh(domMesh* mesh, std::vector<LLModel*>& models_out, U32 submodel_limit);
static std::string getElementLabel(daeElement *element);
- static size_t getSuffixPosition(std::string label);
+ static size_t getSuffixPosition(const std::string& label);
static std::string getLodlessLabel(daeElement *element);
static std::string preprocessDAE(std::string filename);
private:
- U32 mGeneratedModelLimit; // Attempt to limit amount of generated submodels
bool mPreprocessDAE;
};