diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-02-17 21:21:55 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-02-17 21:21:55 +0200 |
| commit | 59092d052f5c8532a5a072ebbafaad038b017640 (patch) | |
| tree | e5a04eede77d0c3ff08ea589bd20d9665b3df493 /indra/newview/llcontrolavatar.h | |
| parent | 9eae41e5825662564125b9f5edf87e1aa3c0c508 (diff) | |
| parent | 00c47d079f7e958e473ed4083a7f7691fa02dcd5 (diff) | |
Merge branch 'master' into DRTVWR-518-ui
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(); |