1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 9b06936c1c..7def9c045f 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -47,6 +47,7 @@ LLControlAvatar::LLControlAvatar(const LLUUID& id, const LLPCode pcode, LLViewer
     mGlobalScale(1.0f),
     mMarkedForDeath(false),
     mRootVolp(NULL),
+    mControlAVBridge(NULL),
     mScaleConstraintFixup(1.0),
 	mRegionChanged(false)
 {
@@ -376,6 +377,12 @@ void LLControlAvatar::idleUpdate(LLAgent &agent, const F64 &time)
     }
 }
 
+void LLControlAvatar::markDead()
+{
+    super::markDead();
+    mControlAVBridge = NULL;
+}
+
 bool LLControlAvatar::computeNeedsUpdate()
 {
 	computeUpdatePeriod();