summaryrefslogtreecommitdiff
path: root/indra/llprimitive/lldaeloader.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llprimitive/lldaeloader.h')
-rw-r--r--indra/llprimitive/lldaeloader.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/llprimitive/lldaeloader.h b/indra/llprimitive/lldaeloader.h
index 7d91a6063b..3ababd3156 100644
--- a/indra/llprimitive/lldaeloader.h
+++ b/indra/llprimitive/lldaeloader.h
@@ -89,19 +89,22 @@ protected:
static bool addVolumeFacesFromDomMesh(LLModel* model, domMesh* mesh);
static bool createVolumeFacesFromDomMesh(LLModel* model, domMesh *mesh);
- static LLModel* loadModelFromDomMesh(domMesh* mesh);
+ static LLModel* loadModelFromDomMesh(domMesh* mesh, bool forceIdNaming);
+ LLModel* loadModelFromDomMesh(domMesh* mesh);
// Loads a mesh breaking it into one or more models as necessary
// to get around volume face limitations while retaining >8 materials
//
bool loadModelsFromDomMesh(domMesh* mesh, std::vector<LLModel*>& models_out, U32 submodel_limit);
- static std::string getElementLabel(daeElement *element);
+ static std::string getElementLabel(daeElement *element, bool forceIdNaming);
+ std::string getElementLabel(daeElement *element);
static size_t getSuffixPosition(std::string label);
- static std::string getLodlessLabel(daeElement *element);
+ static std::string getLodlessLabel(daeElement *element, bool forceIdNaming = false);
private:
U32 mGeneratedModelLimit; // Attempt to limit amount of generated submodels
+ bool mForceIdNaming;
};
#endif // LL_LLDAELLOADER_H