From 8b9ed94a35d7e1cc3ced562eb9e6d303ce016ec6 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Tue, 27 Oct 2020 16:04:19 +0100 Subject: SL-14183, SL-14142 - impostor management improvements, animesh attachments update on frames when their parent does --- indra/newview/llcontrolavatar.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llcontrolavatar.h') diff --git a/indra/newview/llcontrolavatar.h b/indra/newview/llcontrolavatar.h index 288d07cd48..2c68850140 100644 --- a/indra/newview/llcontrolavatar.h +++ b/indra/newview/llcontrolavatar.h @@ -53,7 +53,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& volumes); void updateAnimations(); -- cgit v1.2.3 From c79e648aac9bb32cc1d49d39973b5e96f25828f0 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 4 Nov 2020 16:07:10 +0000 Subject: SL-14015 - possible fix for phantom animesh attachments on mac --- indra/newview/llcontrolavatar.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llcontrolavatar.h') diff --git a/indra/newview/llcontrolavatar.h b/indra/newview/llcontrolavatar.h index 2c68850140..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(); -- cgit v1.2.3