1 files changed, 9 insertions, 0 deletions

diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 8c455a5..ebdbc53 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -450,6 +450,7 @@ void LLAgent::init()
         mEffectColor = gSavedSettings.getColor4("EffectColor");
         
         mInitialized = TRUE;
+        LL_DEBUGS("VOAvatar")<< "ctor of LLAgent" << LL_ENDL;
 }
 
 //-----------------------------------------------------------------------------
@@ -462,6 +463,9 @@ void LLAgent::cleanup()
         mShowAvatar = TRUE;
 
         setSitCamera(LLUUID::null);
+
+        mAvatarObject->markDead();
+
         mAvatarObject = NULL;
         if(mLookAt)
         {
@@ -475,6 +479,7 @@ void LLAgent::cleanup()
         }
         mRegionp = NULL;
         setFocusObject(NULL);
+        LL_DEBUGS("VOAvatar")<< "LLAgent cleanup()" << LL_ENDL;
 }
 
 //-----------------------------------------------------------------------------
@@ -482,11 +487,13 @@ void LLAgent::cleanup()
 //-----------------------------------------------------------------------------
 LLAgent::~LLAgent()
 {
+        LL_DEBUGS("VOAvatar")<< "LLAgent dtor begin" << LL_ENDL;
         cleanup();
 
         delete [] mActiveCacheQueries;
         mActiveCacheQueries = NULL;
 
+        LL_DEBUGS("VOAvatar")<< "LLAgent dtor end" << LL_ENDL;
         // *Note: this is where LLViewerCamera::getInstance() used to be deleted.
 }
 
@@ -7920,6 +7927,8 @@ void LLAgent::userRemoveAllClothesStep2( BOOL proceed, void* userdata )
 
 void LLAgent::userRemoveAllAttachments( void* userdata )
 {
+        LL_DEBUGS("VOAvatar")<< "userRemoveAllAttachments" << LL_ENDL;
+
         LLVOAvatar* avatarp = gAgent.getAvatarObject();
         if(!avatarp)
         {