diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp
index 5c9a156dce..537c68f0f6 100644
--- a/indra/llappearance/llavatarappearance.cpp
+++ b/indra/llappearance/llavatarappearance.cpp
@@ -186,7 +186,8 @@ LLAvatarAppearance::LLAvatarAppearance(LLWearableData* wearable_data) :
 	mPelvisToFoot(0.f),
 	mHeadOffset(),
 	mRoot(NULL),
-	mWearableData(wearable_data)
+	mWearableData(wearable_data),
+    mNextJointNum(0)
 {
 	llassert_always(mWearableData);
 	mBakedTextureDatas.resize(LLAvatarAppearanceDefines::BAKED_NUM_INDICES);
@@ -646,6 +647,8 @@ BOOL LLAvatarAppearance::setupBone(const LLAvatarBoneInfo* info, LLJoint* parent
 		volume_num++;
 	}
 
+    joint->setJointNum(mNextJointNum++);
+
 	// setup children
 	LLAvatarBoneInfo::child_list_t::const_iterator iter;
 	for (iter = info->mChildList.begin(); iter != info->mChildList.end(); ++iter)
@@ -1297,7 +1300,6 @@ LLJoint *LLAvatarAppearance::getCharacterJoint( U32 num )
     if (!mSkeleton[num])
     {
         mSkeleton[num] = createAvatarJoint();
-		mSkeleton[num]->setJointNum(num);
     }
 	return mSkeleton[num];
 }
diff --git a/indra/llappearance/llavatarappearance.h b/indra/llappearance/llavatarappearance.h
index 949e9484be..1913d5189a 100644
--- a/indra/llappearance/llavatarappearance.h
+++ b/indra/llappearance/llavatarappearance.h
@@ -145,6 +145,8 @@ public:
 	// </FS:ND>
 
 	joint_map_t			mJointMap;
+
+    S32					mNextJointNum;
 	
 	void		computeBodySize();
 
diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h
index 2afdef1026..b2736f6c1e 100644
--- a/indra/llcharacter/lljoint.h
+++ b/indra/llcharacter/lljoint.h
@@ -40,9 +40,10 @@
 #include "xform.h"
 
 const S32 LL_CHARACTER_MAX_JOINTS_PER_MESH = 15;
-// Need to set this to count of animate-able joints (currently #bones +
-// #attachments) + 2, rounded to next multiple of 4.
-const U32 LL_CHARACTER_MAX_ANIMATED_JOINTS = 192; // must be divisible by 4!
+// Need to set this to count of animate-able joints,
+// currently = #bones + #collision_volumes + #attachments + 2,
+// rounded to next multiple of 4.
+const U32 LL_CHARACTER_MAX_ANIMATED_JOINTS = 216; // must be divisible by 4!
 const U32 LL_MAX_JOINTS_PER_MESH_OBJECT = 110;
 
 // These should be higher than the joint_num of any
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 519351575b..651ed41128 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -6561,7 +6561,7 @@ void LLVOAvatar::initAttachmentPoints(bool ignore_hud_joints)
         attachment->setVisibleInFirstPerson(info->mVisibleFirstPerson);
         attachment->setIsHUDAttachment(info->mIsHUDAttachment);
         // attachment can potentially be animated, needs a number.
-        attachment->setJointNum(mSkeleton.size() + attachmentID - 1);
+        attachment->setJointNum(mNextJointNum++);
 
         if (newly_created)
         {