Skip to content
Snippets Groups Projects
Commit d88491d5 authored by Richard Linden's avatar Richard Linden
Browse files

rolled back accidental merge of wip code

parent c9695e81
Branches
Tags
No related merge requests found
...@@ -66,9 +66,8 @@ class LLVoiceVisualizer; ...@@ -66,9 +66,8 @@ class LLVoiceVisualizer;
class LLHUDNameTag; class LLHUDNameTag;
class LLHUDEffectSpiral; class LLHUDEffectSpiral;
class LLTexGlobalColor; class LLTexGlobalColor;
struct LLVOAvatarBoneInfo; class LLVOAvatarBoneInfo;
struct LLVOAvatarChildJoint; class LLVOAvatarSkeletonInfo;
struct LLVOAvatarSkeletonInfo;
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// LLVOAvatar // LLVOAvatar
...@@ -328,7 +327,7 @@ class LLVOAvatar : ...@@ -328,7 +327,7 @@ class LLVOAvatar :
void buildCharacter(); void buildCharacter();
virtual BOOL loadAvatar(); virtual BOOL loadAvatar();
BOOL setupBone(const LLVOAvatarChildJoint& info, LLViewerJoint* parent, S32 &current_volume_num, S32 &current_joint_num); BOOL setupBone(const LLVOAvatarBoneInfo* info, LLViewerJoint* parent, S32 &current_volume_num, S32 &current_joint_num);
BOOL buildSkeleton(const LLVOAvatarSkeletonInfo *info); BOOL buildSkeleton(const LLVOAvatarSkeletonInfo *info);
private: private:
BOOL mIsBuilt; // state of deferred character building BOOL mIsBuilt; // state of deferred character building
...@@ -372,7 +371,7 @@ class LLVOAvatar : ...@@ -372,7 +371,7 @@ class LLVOAvatar :
//-------------------------------------------------------------------- //--------------------------------------------------------------------
private: private:
static LLXmlTree sXMLTree; // avatar config file static LLXmlTree sXMLTree; // avatar config file
static LLXMLNodePtr sSkeletonXMLTree; // avatar skeleton file static LLXmlTree sSkeletonXMLTree; // avatar skeleton file
/** Skeleton /** Skeleton
** ** ** **
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment