diff options
author | Oz Linden <oz@lindenlab.com> | 2015-04-13 16:23:36 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-04-13 16:23:36 -0400 |
commit | a8ef2525711f1f9312c1c9ebb8f137f4d25e659a (patch) | |
tree | b1486d5ab0b0eddc26a7dc0f369b12f612179869 /indra/llcharacter | |
parent | 5c6cf3e7fb9f592e3a293921175b64b515bac23f (diff) | |
parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) |
merge changes for 3.7.27-release
Diffstat (limited to 'indra/llcharacter')
-rwxr-xr-x | indra/llcharacter/lljoint.cpp | 1 | ||||
-rwxr-xr-x | indra/llcharacter/lljointstate.h | 24 |
2 files changed, 10 insertions, 15 deletions
diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp index 40695bfa24..8fa08a2a6c 100755 --- a/indra/llcharacter/lljoint.cpp +++ b/indra/llcharacter/lljoint.cpp @@ -361,7 +361,6 @@ void LLJoint::removeAttachmentPosOverride( const LLUUID& mesh_id, const std::str } updatePos(av_info); } - } //-------------------------------------------------------------------- diff --git a/indra/llcharacter/lljointstate.h b/indra/llcharacter/lljointstate.h index b9c91f80b5..1ccc6b5093 100755 --- a/indra/llcharacter/lljointstate.h +++ b/indra/llcharacter/lljointstate.h @@ -64,22 +64,18 @@ protected: public: // Constructor LLJointState() - { - mUsage = 0; - mJoint = NULL; - mUsage = 0; - mWeight = 0.f; - mPriority = LLJoint::USE_MOTION_PRIORITY; - } + : mUsage(0) + , mJoint(NULL) + , mWeight(0.f) + , mPriority(LLJoint::USE_MOTION_PRIORITY) + {} LLJointState(LLJoint* joint) - { - mUsage = 0; - mJoint = joint; - mUsage = 0; - mWeight = 0.f; - mPriority = LLJoint::USE_MOTION_PRIORITY; - } + : mUsage(0) + , mJoint(joint) + , mWeight(0.f) + , mPriority(LLJoint::USE_MOTION_PRIORITY) + {} // joint that this state is applied to LLJoint* getJoint() { return mJoint; } |