From 76e5f3f048c7ab8cbfbbabfb560f45428d4bf046 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 5 May 2010 02:15:10 -0700
Subject: Fixed crash on quit in LLAgent dtor

---
 linden/indra/newview/llagent.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index c44fe3a..532b777 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -471,9 +471,11 @@ void LLAgent::cleanup()
 
 	setSitCamera(LLUUID::null);
 
-	mAvatarObject->markDead();
-
-	mAvatarObject = NULL;
+	if (mAvatarObject)
+	{
+		mAvatarObject->markDead();
+		mAvatarObject = NULL;
+	}
 	if(mLookAt)
 	{
 		mLookAt->markDead() ;
-- 
cgit v1.1