summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-04-11 14:00:26 -0700
committerRichard Linden <none@none>2012-04-11 14:00:26 -0700
commitd88491d55843b62e4206e7a28614d5dcc4ed6b9e (patch)
treec8018ec67015fb831bafa96763e733cf75a12d61
parentc9695e8198db767d759794ae318040d0eee8f444 (diff)
rolled back accidental merge of wip code
-rw-r--r--indra/newview/llvoavatar.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index e84acd51ff..599d7e66b4 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -66,9 +66,8 @@ class LLVoiceVisualizer;
class LLHUDNameTag;
class LLHUDEffectSpiral;
class LLTexGlobalColor;
-struct LLVOAvatarBoneInfo;
-struct LLVOAvatarChildJoint;
-struct LLVOAvatarSkeletonInfo;
+class LLVOAvatarBoneInfo;
+class LLVOAvatarSkeletonInfo;
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// LLVOAvatar
@@ -328,7 +327,7 @@ protected:
void buildCharacter();
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);
private:
BOOL mIsBuilt; // state of deferred character building
@@ -372,7 +371,7 @@ public:
//--------------------------------------------------------------------
private:
static LLXmlTree sXMLTree; // avatar config file
- static LLXMLNodePtr sSkeletonXMLTree; // avatar skeleton file
+ static LLXmlTree sSkeletonXMLTree; // avatar skeleton file
/** Skeleton
** **