Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash in LLControlAvatar::matchVolumeTransform() from Kitty Barnett

Browse Source
This commit is contained in:
Liru Færs
2020-01-05 15:44:31 -05:00
parent 2117c66c9a
commit 5574f263b1
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llcontrolavatar.cpp
View File

@@ -325,6 +325,20 @@ void LLControlAvatar::markForDeath()
mRootVolp = NULL; mRootVolp = NULL;
} }
void LLControlAvatar::markDead()
{
// NOTE: this can happen when the control avatar and root volume are on different regions and we're
// being called from the LLViewerRegion destructor due the region being dropped
// (due to being used as a vehicle and the move not yet being processed?)
if (mRootVolp)
{
mRootVolp->unlinkControlAvatar();
mRootVolp = nullptr;
}
LLVOAvatar::markDead();
}
void LLControlAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) void LLControlAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
{ {
if (mMarkedForDeath) if (mMarkedForDeath)

1
indra/newview/llcontrolavatar.h
View File

@@ -52,6 +52,7 @@ public:
// Delayed kill so we don't make graphics pipeline unhappy calling // Delayed kill so we don't make graphics pipeline unhappy calling
// markDead() inside other graphics pipeline operations. // markDead() inside other graphics pipeline operations.
void markForDeath(); void markForDeath();
void markDead() override;
void idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) override; void idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) override;
BOOL updateCharacter(LLAgent &agent) override; BOOL updateCharacter(LLAgent &agent) override;