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/llcharacter/lljoint.cpp | |
parent | 97374a5362f097afd3027ea51757de2e36af4798 (diff) | |
parent | cb64c3d3c3ca027fc49ef655e2ce0acecb3b230d (diff) |
Pulled merge from bento prime.
Diffstat (limited to 'indra/llcharacter/lljoint.cpp')
-rwxr-xr-x | indra/llcharacter/lljoint.cpp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp index 8fa08a2a6c..2c6278fe45 100755 --- a/indra/llcharacter/lljoint.cpp +++ b/indra/llcharacter/lljoint.cpp @@ -108,6 +108,7 @@ void LLJoint::init() mXform.setScale(LLVector3(1.0f, 1.0f, 1.0f)); mDirtyFlags = MATRIX_DIRTY | ROTATION_DIRTY | POSITION_DIRTY; mUpdateXform = TRUE; + mSupport = SUPPORT_BASE; } LLJoint::LLJoint() : @@ -170,6 +171,27 @@ void LLJoint::setup(const std::string &name, LLJoint *parent) } //----------------------------------------------------------------------------- +// setSupport() +//----------------------------------------------------------------------------- +void LLJoint::setSupport(const std::string& support_name) +{ + if (support_name == "extended") + { + setSupport(SUPPORT_EXTENDED); + } + else if (support_name == "base") + { + setSupport(SUPPORT_BASE); + } + else + { + LL_WARNS() << "unknown support string " << support_name << LL_ENDL; + setSupport(SUPPORT_BASE); + } +} + + +//----------------------------------------------------------------------------- // touch() // Sets all dirty flags for all children, recursively. //----------------------------------------------------------------------------- |