summaryrefslogtreecommitdiff
path: root/indra/llcharacter/lljointstate.h
diff options
context:
space:
mode:
authorBjoseph Wombat <bjoseph@vivox.com>2015-05-11 14:57:57 +0100
committerBjoseph Wombat <bjoseph@vivox.com>2015-05-11 14:57:57 +0100
commitc6650c13306b0d049ecba02710645b9ca2d90c05 (patch)
tree54932d9221df41ec9c608b70eeb5379fcb1d72c3 /indra/llcharacter/lljointstate.h
parent7ec58ee04789a8cc819d1151529d843045651bc8 (diff)
parente611e35e033e99f619b0e4938f6879c8e387efd5 (diff)
updates from bitbucket repository
Diffstat (limited to 'indra/llcharacter/lljointstate.h')
-rwxr-xr-xindra/llcharacter/lljointstate.h24
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; }