diff options
author | Aura Linden <aura@lindenlab.com> | 2015-10-27 15:33:21 -0700 |
---|---|---|
committer | Aura Linden <aura@lindenlab.com> | 2015-10-27 15:33:21 -0700 |
commit | 07496b015b01899b21960b60d2f3af7bf317c349 (patch) | |
tree | f44564827e1570113457f2312ee23073135233bc /indra/llprimitive/lldaeloader.cpp | |
parent | 97374a5362f097afd3027ea51757de2e36af4798 (diff) | |
parent | cb64c3d3c3ca027fc49ef655e2ce0acecb3b230d (diff) |
Pulled merge from bento prime.
Diffstat (limited to 'indra/llprimitive/lldaeloader.cpp')
-rw-r--r-- | indra/llprimitive/lldaeloader.cpp | 6 |
1 files changed, 4 insertions, 2 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; } } } |