Bento hell and back, and back to hell, and back.

2017-01-11 03:55:36 -06:00
parent 9dbdf75c14
commit 98516a2a22
54 changed files with 8482 additions and 2423 deletions
--- a/indra/llprimitive/lldaeloader.h
+++ b/indra/llprimitive/lldaeloader.h
@@ -53,11 +53,13 @@ public:
 		LLModelLoader::joint_lookup_func_t	joint_lookup_func,
 		LLModelLoader::texture_load_func_t	texture_load_func,
 		LLModelLoader::state_callback_t		state_cb,
-		void*											opaque_userdata,
-		JointTransformMap&						jointMap,
-		JointSet&									jointsFromNodes,
+		void*								opaque_userdata,
+		JointTransformMap&					jointTransformMap,
+		JointNameSet&						jointsFromNodes,
+		std::map<std::string, std::string>&	jointAliasMap,
+		U32									maxJointsPerMesh,
 		U32									modelLimit,
-		bool									preprocess);
+		bool								preprocess);
 	virtual ~LLDAELoader() ;

 	virtual bool OpenFile(const std::string& filename);