Pulled merge from bento prime.

2 files changed, 7 insertions, 3 deletions

diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index b4c5c844ef..c50db824af 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -1257,7 +1257,8 @@ void LLDAELoader::processDomModel(LLModel* model, DAE* dae, daeElement* root, do
 								name = mJointMap[name];
 							}
 							model->mSkinInfo.mJointNames.push_back(name);
-							model->mSkinInfo.mJointMap[name] = j;
+                            // BENTO this does not appear to be used anywhere.
+							// model->mSkinInfo.mJointMap[name] = j;
 						}
 					}
 					else
@@ -1275,7 +1276,8 @@ void LLDAELoader::processDomModel(LLModel* model, DAE* dae, daeElement* root, do
 									name = mJointMap[name];
 								}
 								model->mSkinInfo.mJointNames.push_back(name);
-								model->mSkinInfo.mJointMap[name] = j;
+                                // BENTO not used?
+								// model->mSkinInfo.mJointMap[name] = j;
 							}
 						}
 					}
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h
index ae602c09df..56844ac16d 100755
--- a/indra/llprimitive/llmodel.h
+++ b/indra/llprimitive/llmodel.h
@@ -46,7 +46,9 @@ public:
 	std::vector<std::string> mJointNames;
 	std::vector<LLMatrix4> mInvBindMatrix;
 	std::vector<LLMatrix4> mAlternateBindMatrix;
-	std::map<std::string, U32> mJointMap;
+    std::vector<U32> mJointRemap;
+    // BENTO not used?
+	//std::map<std::string, U32> mJointMap;
 
 	LLMeshSkinInfo() { }
 	LLMeshSkinInfo(LLSD& data);