summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-10-12 22:24:46 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-10-12 22:26:50 +0300
commitfa52c0393901389b45c2d73033165cf8bc0ced98 (patch)
tree52c288fa6e50f0fea11ac8b91be5ad80f4cdce96
parenta5dd5037f894338ee97e458041d22ceae9cd0183 (diff)
SL-13980 Crash at cullAvatarsByPixelArea
LLVOAvatars and derived classes appear to be stored as LLPointer<LLViewerObject> in a lot of cases, so non-virtual ~LLViewerObject() might be triggered by LLPointer and end up not cleaning sInstances in some cases (animeshes specific?), thus causing broken pointers in sInstances.
-rw-r--r--indra/newview/llviewerobject.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 12a9b47307..250c4ac328 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -114,7 +114,7 @@ class LLViewerObject
public LLTrace::MemTrackable<LLViewerObject>
{
protected:
- ~LLViewerObject(); // use unref()
+ virtual ~LLViewerObject(); // use unref()
// TomY: Provide for a list of extra parameter structures, mapped by structure name
struct ExtraParameter