Backed out changeset: de52f1d38f3c

1 files changed, 3 insertions, 6 deletions

diff --git a/indra/llprimitive/lldaeloader.h b/indra/llprimitive/lldaeloader.h
index 3ababd3156..7d91a6063b 100644
--- a/indra/llprimitive/lldaeloader.h
+++ b/indra/llprimitive/lldaeloader.h
@@ -89,22 +89,19 @@ 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);
 
 private:
 	U32 mGeneratedModelLimit; // Attempt to limit amount of generated submodels
-	bool mForceIdNaming;
 
 };
 #endif  // LL_LLDAELLOADER_H