summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-09-29 09:59:50 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-09-29 09:59:50 -0400
commit801a628cc116954f589d8478d5cfa06998db6beb (patch)
tree8c23706032eb6f055391534ac70b1844b510d490 /indra
parent8d6bb9ee4e9def306454e9ecda1980793dcf7ad5 (diff)
SL-451 - removed member variable that's no longer used with current joint numbering scheme
Diffstat (limited to 'indra')
-rw-r--r--indra/llappearance/llavatarappearance.cpp3
-rw-r--r--indra/llappearance/llavatarappearance.h2
2 files changed, 0 insertions, 5 deletions
diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp
index ebeab22dcc..94c431feb4 100644
--- a/indra/llappearance/llavatarappearance.cpp
+++ b/indra/llappearance/llavatarappearance.cpp
@@ -187,7 +187,6 @@ LLAvatarAppearance::LLAvatarAppearance(LLWearableData* wearable_data) :
mHeadOffset(),
mRoot(NULL),
mWearableData(wearable_data),
- mNextJointNum(0),
mNumBones(0),
mNumCollisionVolumes(0),
mCollisionVolumes(NULL),
@@ -674,7 +673,6 @@ BOOL LLAvatarAppearance::setupBone(const LLAvatarBoneInfo* info, LLJoint* parent
joint->setJointNum(mNumBones+volume_num);
volume_num++;
}
- mNextJointNum++;
// setup children
@@ -713,7 +711,6 @@ BOOL LLAvatarAppearance::allocateCharacterJoints( U32 num )
BOOL LLAvatarAppearance::buildSkeleton(const LLAvatarSkeletonInfo *info)
{
LL_DEBUGS("BVH") << "numBones " << info->mNumBones << " numCollisionVolumes " << info->mNumCollisionVolumes << LL_ENDL;
- mNextJointNum = 0;
// allocate joints
if (!allocateCharacterJoints(info->mNumBones))
diff --git a/indra/llappearance/llavatarappearance.h b/indra/llappearance/llavatarappearance.h
index 77795f3bf6..ccd6323ed8 100644
--- a/indra/llappearance/llavatarappearance.h
+++ b/indra/llappearance/llavatarappearance.h
@@ -140,8 +140,6 @@ public:
typedef std::map<std::string, LLJoint*> joint_map_t;
joint_map_t mJointMap;
- S32 mNextJointNum;
-
typedef std::map<std::string, LLVector3> joint_state_map_t;
joint_state_map_t mLastBodySizeState;
joint_state_map_t mCurrBodySizeState;