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/llappearance | |
| parent | 97374a5362f097afd3027ea51757de2e36af4798 (diff) | |
| parent | cb64c3d3c3ca027fc49ef655e2ce0acecb3b230d (diff) | |
Pulled merge from bento prime.
Diffstat (limited to 'indra/llappearance')
| -rwxr-xr-x | indra/llappearance/llavatarappearance.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp index f2cd2768d8..a464ffcb43 100755 --- a/indra/llappearance/llavatarappearance.cpp +++ b/indra/llappearance/llavatarappearance.cpp @@ -87,6 +87,7 @@ public: private: std::string mName; + std::string mSupport; BOOL mIsJoint; LLVector3 mPos; LLVector3 mRot; @@ -605,6 +606,7 @@ BOOL LLAvatarAppearance::setupBone(const LLAvatarBoneInfo* info, LLJoint* parent joint->setRotation(mayaQ(info->mRot.mV[VX], info->mRot.mV[VY], info->mRot.mV[VZ], LLQuaternion::XYZ)); joint->setScale(info->mScale); + joint->setSupport(info->mSupport); if (info->mIsJoint) { @@ -1564,6 +1566,13 @@ BOOL LLAvatarBoneInfo::parseXml(LLXmlTreeNode* node) return FALSE; } + static LLStdStringHandle support_string = LLXmlTree::addAttributeString("support"); + if (!node->getFastAttributeString(support_string,mSupport)) + { + LL_WARNS() << "Bone without support" << LL_ENDL; + mSupport = "base"; + } + if (mIsJoint) { static LLStdStringHandle pivot_string = LLXmlTree::addAttributeString("pivot"); |