merge

1 files changed, 8 insertions, 7 deletions

diff --git a/indra/llprimitive/lldaeloader.h b/indra/llprimitive/lldaeloader.h
index 852dc1b3ac..4e990dbe5e 100644
--- a/indra/llprimitive/lldaeloader.h
+++ b/indra/llprimitive/lldaeloader.h
@@ -58,7 +58,8 @@ public:
 		JointNameSet&						jointsFromNodes,
         std::map<std::string, std::string>& jointAliasMap,
         U32									maxJointsPerMesh,
-		U32									modelLimit);
+		U32									modelLimit,
+        bool								preprocess);
 	virtual ~LLDAELoader() ;
 
 	virtual bool OpenFile(const std::string& filename);
@@ -91,22 +92,22 @@ protected:
 	static bool addVolumeFacesFromDomMesh(LLModel* model, domMesh* mesh);
 	static bool createVolumeFacesFromDomMesh(LLModel* model, domMesh *mesh);
 
-	static LLModel* loadModelFromDomMesh(domMesh* mesh, bool forceIdNaming);
-	LLModel* loadModelFromDomMesh(domMesh* mesh);
+	static 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, bool forceIdNaming);
-	std::string getElementLabel(daeElement *element);
+	static std::string getElementLabel(daeElement *element);
 	static size_t getSuffixPosition(std::string label);
-	static std::string getLodlessLabel(daeElement *element, bool forceIdNaming = false);
+	static std::string getLodlessLabel(daeElement *element);
+
+	static std::string preprocessDAE(std::string filename);
 
 private:
 	U32 mGeneratedModelLimit; // Attempt to limit amount of generated submodels
-	bool mForceIdNaming;
+	bool mPreprocessDAE;
 
 };
 #endif  // LL_LLDAELLOADER_H