diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-02-17 15:10:32 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-02-17 15:10:32 -0700 |
| commit | 57e0d91d16b28758c41bc6fa96ecb42908d591c5 (patch) | |
| tree | ab0e80b363385cd6335f133ca0a0a0488f92c8f3 /indra/newview/llcontrolavatar.h | |
| parent | de711c213820521aa8afcf991b4af561db54aede (diff) | |
| parent | 00c47d079f7e958e473ed4083a7f7691fa02dcd5 (diff) | |
Merge branch 'master' v 6.4.14 into DV528-merge-6.4.14
Diffstat (limited to 'indra/newview/llcontrolavatar.h')
| -rw-r--r-- | indra/newview/llcontrolavatar.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llcontrolavatar.h b/indra/newview/llcontrolavatar.h index 288d07cd48..8e87299f3e 100644 --- a/indra/newview/llcontrolavatar.h +++ b/indra/newview/llcontrolavatar.h @@ -40,6 +40,10 @@ public: virtual void initInstance(); // Called after construction to initialize the class. virtual ~LLControlAvatar(); + // If this is an attachment, return the avatar it is attached to. Otherwise NULL. + virtual const LLVOAvatar *getAttachedAvatar() const; + virtual LLVOAvatar *getAttachedAvatar(); + void getNewConstraintFixups(LLVector3& new_pos_constraint, F32& new_scale_constraint) const; void matchVolumeTransform(); void updateVolumeGeom(); @@ -53,7 +57,8 @@ public: void markForDeath(); virtual void idleUpdate(LLAgent &agent, const F64 &time); - virtual BOOL updateCharacter(LLAgent &agent); + virtual bool computeNeedsUpdate(); + virtual bool updateCharacter(LLAgent &agent); void getAnimatedVolumes(std::vector<LLVOVolume*>& volumes); void updateAnimations(); |