diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-04-13 17:19:27 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-04-13 17:19:27 -0400 |
| commit | 32940ee90b6dae898f83cf99516f18f106246ace (patch) | |
| tree | 1fca162d8adc5b7aed5a0193627d6caf773f09fd /indra/llcharacter/lljointstate.h | |
| parent | cddfcda1677c4a5d25d2adc54eb4c3aef0953ee1 (diff) | |
| parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) | |
merge
Diffstat (limited to 'indra/llcharacter/lljointstate.h')
| -rwxr-xr-x | indra/llcharacter/lljointstate.h | 24 |
1 files changed, 10 insertions, 14 deletions
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; } |