From 21e409d8741b07ec9e4f865f868671f0954886f3 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Fri, 23 Oct 2020 23:53:40 -0400
Subject: [PATCH] Fix crash in AOEngine::foreignAnimations
---
indra/newview/alaoengine.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/alaoengine.cpp b/indra/newview/alaoengine.cpp
index 8442770c2d7..91b54210c7a 100644
--- a/indra/newview/alaoengine.cpp
+++ b/indra/newview/alaoengine.cpp
@@ -179,10 +179,10 @@ bool ALAOEngine::foreignAnimations(const LLUUID& seat)
}
// find the source object where the animation came from
- LLViewerObject* source=gObjectList.findObject(animation_source.first);
+ LLViewerObject* source = gObjectList.findObject(animation_source.first);
// proceed if it's not an attachment
- if(!source->isAttachment())
+ if(source && !source->isAttachment())
{
// get the source's root prim
LLViewerObject* sourceRoot=dynamic_cast<LLViewerObject*>(source->getRoot());
--
GitLab