diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-06-28 16:32:54 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-06-28 16:32:54 -0500 |
| commit | bedbbf7c0201275e0a48a0cbbb2a567be4baab3d (patch) | |
| tree | f11f9e612ab503e596073269c17c6e4cc1d3ae13 /indra/newview/llvoavatar.h | |
| parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) | |
| parent | f3afac420cd3c89eb396fb1f0b77ab4804212415 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rw-r--r-- | indra/newview/llvoavatar.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 6fb56a4c0b..78259c670d 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -124,7 +124,7 @@ public: U32 block_num, const EObjectUpdateType update_type, LLDataPacker *dp); - virtual BOOL idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time); + virtual void idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time); virtual BOOL updateLOD(); BOOL updateJointLODs(); void updateLODRiggedAttachments( void ); @@ -356,6 +356,10 @@ public: LLVector3 mHeadOffset; // current head position LLViewerJoint mRoot; + + typedef std::map<std::string, LLJoint*> joint_map_t; + joint_map_t mJointMap; + protected: static BOOL parseSkeletonFile(const std::string& filename); void buildCharacter(); |