diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-09-07 11:15:56 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-09-07 11:15:56 -0400 |
| commit | b8e67774397f2878aafc5906845f5f738e00c408 (patch) | |
| tree | 02ed12e0d5534fbf71f3ab8ce222d7508d73166d /indra/newview/llcontrolavatar.h | |
| parent | 755f9d9ac9548e27d68ec701676e20c4824833f8 (diff) | |
| parent | d454512050e636a19e4b7545515dea4f4b1bbf0d (diff) | |
SL-18837: Merge branch 'main' into actions
Diffstat (limited to 'indra/newview/llcontrolavatar.h')
| -rw-r--r-- | indra/newview/llcontrolavatar.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llcontrolavatar.h b/indra/newview/llcontrolavatar.h index 8e87299f3e..50e02d2d91 100644 --- a/indra/newview/llcontrolavatar.h +++ b/indra/newview/llcontrolavatar.h @@ -35,9 +35,12 @@ class LLControlAvatar: { LOG_CLASS(LLControlAvatar); + using super = LLVOAvatar; + public: LLControlAvatar(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp); - virtual void initInstance(); // Called after construction to initialize the class. + virtual void initInstance(); // Called after construction to initialize the class. + virtual void markDead(); virtual ~LLControlAvatar(); // If this is an attachment, return the avatar it is attached to. Otherwise NULL. @@ -87,6 +90,7 @@ public: F32 mGlobalScale; LLVOVolume *mRootVolp; + class LLControlAVBridge* mControlAVBridge; bool mMarkedForDeath; |