From 24118e8e676ef8e9307aa4d4bfb6082472e60d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Sun, 5 Jan 2020 00:07:36 -0500 Subject: [PATCH] [Animesh] Hook up isImposter override for control avatars --- indra/newview/llcontrolavatar.cpp | 2 +- indra/newview/llcontrolavatar.h | 2 +- indra/newview/llvoavatar.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp index 17f34e41d..e0e7e820b 100644 --- a/indra/newview/llcontrolavatar.cpp +++ b/indra/newview/llcontrolavatar.cpp @@ -606,7 +606,7 @@ bool LLControlAvatar::shouldRenderRigged() const } // virtual -BOOL LLControlAvatar::isImpostor() +BOOL LLControlAvatar::isImpostor() const { if (mRootVolp && mRootVolp->isAttachment()) { diff --git a/indra/newview/llcontrolavatar.h b/indra/newview/llcontrolavatar.h index dca0ec0ac..7776ed901 100644 --- a/indra/newview/llcontrolavatar.h +++ b/indra/newview/llcontrolavatar.h @@ -76,7 +76,7 @@ public: bool shouldRenderRigged() const override; - virtual BOOL isImpostor(); + BOOL isImpostor() const override; bool mPlaying; diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index a996f6e9b..d28527499 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -555,7 +555,7 @@ private: // Impostors //-------------------------------------------------------------------- public: - BOOL isImpostor() const; + virtual BOOL isImpostor() const; BOOL shouldImpostor(const U32 rank_factor = 1) const; BOOL needsImpostorUpdate() const; const LLVector3& getImpostorOffset() const;