merge, close develop branch

--HG--
branch : develop

1 files changed, 14 insertions, 13 deletions

diff --git a/indra/llprimitive/llmodelloader.h b/indra/llprimitive/llmodelloader.h
index bb4d06dca3..894de2c76f 100644
--- a/indra/llprimitive/llmodelloader.h
+++ b/indra/llprimitive/llmodelloader.h
@@ -34,10 +34,10 @@
 
 class LLJoint;
 
-typedef std::map<std::string, LLMatrix4>					JointTransformMap;
-typedef std::map<std::string, LLMatrix4>:: iterator	JointTransformMapIt;
-typedef std::map<std::string, std::string>				JointMap;
-typedef std::deque<std::string>								JointSet;
+typedef std::map<std::string, LLMatrix4>			JointTransformMap;
+typedef std::map<std::string, LLMatrix4>::iterator	JointTransformMapIt;
+typedef std::map<std::string, std::string>			JointMap;
+typedef std::deque<std::string>						JointNameSet;
 
 const S32 SLM_SUPPORTED_VERSION	= 3;
 const S32 NUM_LOD						= 4;
@@ -116,18 +116,19 @@ public:
 	//map of avatar joints as named in COLLADA assets to internal joint names
 	JointMap			mJointMap;
 	JointTransformMap&	mJointList;	
-	JointSet&			mJointsFromNode;
+	JointNameSet&		mJointsFromNode;
 
 	LLModelLoader(
-		std::string									filename,
-		S32											lod, 
+		std::string							filename,
+		S32									lod, 
 		LLModelLoader::load_callback_t		load_cb,
 		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,
+        JointNameSet&						legalJointNames);
 	virtual ~LLModelLoader() ;
 
 	virtual void setNoNormalize() { mNoNormalize = true; }
@@ -189,7 +190,7 @@ protected:
 	LLModelLoader::joint_lookup_func_t	mJointLookupFunc;
 	LLModelLoader::texture_load_func_t	mTextureLoadFunc;
 	LLModelLoader::state_callback_t		mStateCallback;
-	void*											mOpaqueData;
+	void*								mOpaqueData;
 
 	bool		mRigParityWithScene;
 	bool		mRigValidJointUpload;
@@ -198,8 +199,8 @@ protected:
 	bool		mNoNormalize;
 	bool		mNoOptimize;
 
-	JointSet				mMasterJointList;
-	JointSet				mMasterLegacyJointList;
+	JointNameSet		mMasterJointList;
+	JointNameSet		mMasterLegacyJointList;
 	JointTransformMap	mJointTransformMap;
 
 	static std::list<LLModelLoader*> sActiveLoaderList;