diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-12 17:05:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-12 17:05:23 +0300 |
| commit | 9bc190c8d3ddd7a692636bb349952144fd511622 (patch) | |
| tree | 07b0a9297a67667b5c85c4eb4950628e344c5106 /indra/newview/llviewermessage.cpp | |
| parent | f5a7fba76a24a96f906abcbd928f37e4eabfa76c (diff) | |
| parent | eab5beb54cacc2b0dc2cddad4a78634e7468a298 (diff) | |
Merge pull request #1211 from secondlife/marchcat/x-merge
Release (Maint W) -> Maint X merge
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index b41d1d9712..ed96e11c6b 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -4236,7 +4236,7 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data) LLObjectSignaledAnimationMap::instance().getMap()[uuid] = signaled_anims; LLViewerObject *objp = gObjectList.findObject(uuid); - if (!objp) + if (!objp || objp->isDead()) { LL_DEBUGS("AnimatedObjectsNotify") << "Received animation state for unknown object " << uuid << LL_ENDL; return; |