diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-12-19 23:20:47 +0200 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-12-19 23:20:47 +0200 |
| commit | 027899963cb8443e7880b4d4aa6c429d16db488b (patch) | |
| tree | c57a93342fbe6f8e032198e85478705976f3f986 /indra/llappearance/llavatarappearance.h | |
| parent | e21f8284fdd9cd86e2822b233775e9a3d77917d5 (diff) | |
| parent | 4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (diff) | |
merge with 3.7.23-release
Diffstat (limited to 'indra/llappearance/llavatarappearance.h')
| -rwxr-xr-x | indra/llappearance/llavatarappearance.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llappearance/llavatarappearance.h b/indra/llappearance/llavatarappearance.h index 1e898026c0..a0ef49b7cb 100755 --- a/indra/llappearance/llavatarappearance.h +++ b/indra/llappearance/llavatarappearance.h @@ -152,11 +152,17 @@ protected: BOOL mIsBuilt; // state of deferred character building typedef std::vector<LLAvatarJoint*> avatar_joint_list_t; avatar_joint_list_t mSkeleton; - + LLPosOverrideMap mPelvisFixups; + //-------------------------------------------------------------------- // Pelvis height adjustment members. //-------------------------------------------------------------------- public: + void addPelvisFixup( F32 fixup, const LLUUID& mesh_id ); + void removePelvisFixup( const LLUUID& mesh_id ); + bool hasPelvisFixup( F32& fixup, LLUUID& mesh_id ) const; + bool hasPelvisFixup( F32& fixup ) const; + LLVector3 mBodySize; LLVector3 mAvatarOffset; protected: |