summaryrefslogtreecommitdiff
path: root/indra/llappearance/llavatarappearance.h
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2015-11-13 04:12:13 -0800
committerAura Linden <aura@lindenlab.com>2015-11-13 04:12:13 -0800
commit99219cbe80d56dbd9d6f75689304ce2759592868 (patch)
treeedddfd8003e918e5f922c500560b4ffcc2dd0689 /indra/llappearance/llavatarappearance.h
parent146919fa764bed09bfa5e27bc30d02ce2afb6188 (diff)
parentb72480ddb9b01202f1bbe4bfb84595549faeacf3 (diff)
Eliminated joint_offset file. Added aliases attrib to bones in avatar_skeleton.xml.
Diffstat (limited to 'indra/llappearance/llavatarappearance.h')
-rwxr-xr-xindra/llappearance/llavatarappearance.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llappearance/llavatarappearance.h b/indra/llappearance/llavatarappearance.h
index 43a5274840..5cff1eef1e 100755
--- a/indra/llappearance/llavatarappearance.h
+++ b/indra/llappearance/llavatarappearance.h
@@ -127,6 +127,9 @@ protected:
virtual LLAvatarJoint* createAvatarJoint() = 0;
virtual LLAvatarJoint* createAvatarJoint(S32 joint_num) = 0;
virtual LLAvatarJointMesh* createAvatarJointMesh() = 0;
+ void makeJointAliases(LLAvatarBoneInfo *bone_info);
+
+
public:
F32 getPelvisToFoot() const { return mPelvisToFoot; }
/*virtual*/ LLJoint* getRootJoint() { return mRoot; }
@@ -142,6 +145,9 @@ public:
public:
typedef std::vector<LLAvatarJoint*> avatar_joint_list_t;
const avatar_joint_list_t& getSkeleton() { return mSkeleton; }
+ typedef std::map<std::string, std::string> joint_alias_map_t;
+ const joint_alias_map_t& getJointAliases();
+
protected:
static BOOL parseSkeletonFile(const std::string& filename);
@@ -156,6 +162,7 @@ protected:
BOOL mIsBuilt; // state of deferred character building
avatar_joint_list_t mSkeleton;
LLPosOverrideMap mPelvisFixups;
+ joint_alias_map_t mJointAliasMap;
//--------------------------------------------------------------------
// Pelvis height adjustment members.