diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 0dd3aa059..f29850df1 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -223,9 +223,10 @@ public:
 	}
 	BOOL parseXml(LLXmlTreeNode* node);
 	
+	BOOL mIsJoint;
+	
 private:
 	std::string mName;
-	BOOL mIsJoint;
 	LLVector3 mPos;
 	LLVector3 mRot;
 	LLVector3 mScale;
@@ -752,13 +753,13 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
 	mNeedsSkin(FALSE),
 	mUpdatePeriod(1),
 	mFullyLoadedInitialized(FALSE),
-	mHasBakedHair( FALSE ),
+	mHasBakedHair( FALSE )
 	// <edit>
-	mNametagSaysIdle(false),
-	mIdleForever(true),
-	mIdleMinutes(0),
-	mFocusObject(LLUUID::null),
-	mFocusVector(LLVector3d::zero)
+//	mNametagSaysIdle(false),
+//	mIdleForever(true),
+//	mIdleMinutes(0),
+//	mFocusObject(LLUUID::null),
+//	mFocusVector(LLVector3d::zero)
 	// </edit>
 {
 	LLMemType mt(LLMemType::MTYPE_AVATAR);
@@ -3071,8 +3072,6 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
 					mNameText->setUseBubble(TRUE);
 					sNumVisibleChatBubbles++;
 					new_name = TRUE;
-				}
-				
 				}
 				
 				// <edit>
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index f44cfaa61..3f1a8c8ce 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -684,7 +684,8 @@ protected:
 	S32				getLocalDiscardLevel(LLVOAvatarDefines::ETextureIndex index);
 public:
 	static void updateFreezeCounter(S32 counter = 0 );
-// <edit>
+// <edit>
+
 public:
 	//bool mNametagSaysIdle;
 	//bool mIdleForever;
@@ -694,6 +695,23 @@ public:
 	LLVector3d mFocusVector;
 	//void resetIdleTime();
 // </edit>
+
+private:
+	static S32 sFreezeCounter;
+	
+	//-----------------------------------------------------------------------------------------------
+	// Avatar skeleton setup.
+	//-----------------------------------------------------------------------------------------------
+private:
+	BOOL loadAvatar();
+	BOOL setupBone(const LLVOAvatarBoneInfo* info, LLViewerJoint* parent, S32 &current_volume_num, S32 &current_joint_num);
+	BOOL buildSkeleton(const LLVOAvatarSkeletonInfo *info);
+
+	//-----------------------------------------------------------------------------------------------
+	// Per-avatar information about texture data.
+	// To-do: Move this to private implementation class
+	//-----------------------------------------------------------------------------------------------
+
 	struct BakedTextureData
 	{
 		LLUUID			mLastTextureIndex;