From 4f2f604e5675b75f69ac95d1e9818b46717ba7cf Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Wed, 13 Mar 2013 18:07:40 +0100
Subject: [PATCH] To prevent logout crahes, do not call logPendingPhases once
 gAgentAvatarp is 0.

---
 indra/newview/llvoavatar.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 79955f171d..1761a4a9a9 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -761,8 +761,14 @@ LLVOAvatar::~LLVOAvatar()
 		debugAvatarRezTime("AvatarRezLeftNotification","left sometime after declouding");
 	}
 
-	logPendingPhases();
+	// <FS:ND> only call logPendingPhases if we're still alive. Otherwise this can lead to shutdown crashes 
+
+	// logPendingPhases();
+	if (isAgentAvatarValid())
+		logPendingPhases();
 	
+	// </FS:ND>
+
 	lldebugs << "LLVOAvatar Destructor (0x" << this << ") id:" << mID << llendl;
 
 	std::for_each(mAttachmentPoints.begin(), mAttachmentPoints.end(), DeletePairedPointer());