#4619 Don't crash on LLHUDEffect::render

LLHUDEffectResetSkeleton needs to override LLHUDEffect::render to not
cause an LL_ERRS if it stays alive for too long.

2 files changed, 16 insertions, 6 deletions

diff --git a/indra/newview/llhudeffectresetskeleton.cpp b/indra/newview/llhudeffectresetskeleton.cpp
index 31065a3e76..2bb5696f59 100644
--- a/indra/newview/llhudeffectresetskeleton.cpp
+++ b/indra/newview/llhudeffectresetskeleton.cpp
@@ -56,6 +56,15 @@ LLHUDEffectResetSkeleton::~LLHUDEffectResetSkeleton()
 //-----------------------------------------------------------------------------
 // packData()
 //-----------------------------------------------------------------------------
+void LLHUDEffectResetSkeleton::render()
+{
+    // HUDEffectResetSkeleton is a fake effect meant to reset skeleton only.
+    // Just wait for an update() call to do its work and then die.
+}
+
+//-----------------------------------------------------------------------------
+// packData()
+//-----------------------------------------------------------------------------
 void LLHUDEffectResetSkeleton::packData(LLMessageSystem *mesgsys)
 {
     // Pack the default data
diff --git a/indra/newview/llhudeffectresetskeleton.h b/indra/newview/llhudeffectresetskeleton.h
index 39a6137054..c89516d7fc 100644
--- a/indra/newview/llhudeffectresetskeleton.h
+++ b/indra/newview/llhudeffectresetskeleton.h
@@ -38,20 +38,21 @@ class LLHUDEffectResetSkeleton final : public LLHUDEffect
 public:
     friend class LLHUDObject;
 
-    /*virtual*/ void markDead();
-    /*virtual*/ void setSourceObject(LLViewerObject* objectp);
+    /*virtual*/ void markDead() override;
+    /*virtual*/ void setSourceObject(LLViewerObject* objectp) override;
 
-    void setTargetObject(LLViewerObject *objp);
+    void setTargetObject(LLViewerObject *objp) override;
     void setResetAnimations(bool enable){ mResetAnimations = enable; };
 
 protected:
     LLHUDEffectResetSkeleton(const U8 type);
     ~LLHUDEffectResetSkeleton();
 
-    /*virtual*/ void packData(LLMessageSystem *mesgsys);
-    /*virtual*/ void unpackData(LLMessageSystem *mesgsys, S32 blocknum);
+    void render() override;
+    void packData(LLMessageSystem *mesgsys) override;
+    void unpackData(LLMessageSystem *mesgsys, S32 blocknum) override;
 
-    void update();
+    void update() override;
 private:
     bool                        mResetAnimations;
 };