From 801a628cc116954f589d8478d5cfa06998db6beb Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 29 Sep 2016 09:59:50 -0400 Subject: SL-451 - removed member variable that's no longer used with current joint numbering scheme --- indra/llappearance/llavatarappearance.cpp | 3 --- indra/llappearance/llavatarappearance.h | 2 -- 2 files changed, 5 deletions(-) (limited to 'indra') 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 joint_map_t; joint_map_t mJointMap; - S32 mNextJointNum; - typedef std::map joint_state_map_t; joint_state_map_t mLastBodySizeState; joint_state_map_t mCurrBodySizeState; -- cgit v1.2.3