From 34cf0329ab3e92372e9643834fe27ec089bd8716 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Mon, 25 Feb 2013 12:55:50 -0600 Subject: [PATCH] Crahfix for avatars, as destruction can be delayed via llpointer refs, meaning the region the av was in could be long gone before the avs destructor is actually called. Calling logPendingPhases in a more reasonable place (markDead). --- indra/newview/llvoavatar.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 6e5a27a9a..dbee3884b 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -1120,7 +1120,7 @@ LLVOAvatar::~LLVOAvatar() } } - logPendingPhases(); + //logPendingPhases(); lldebugs << "LLVOAvatar Destructor (0x" << this << ") id:" << mID << llendl; @@ -1156,7 +1156,12 @@ void LLVOAvatar::markDead() } mVoiceVisualizer->markDead(); LLLoadedCallbackEntry::cleanUpCallbackList(&mCallbackTextureList) ; + + if(!isDead()) + logPendingPhases(); + LLViewerObject::markDead(); + }