From 61d6beb56cdfe2d0b254435d26c9aa50efaef211 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 7 Jul 2013 23:48:59 +0200 Subject: [PATCH] Crashfix: Properly clean up observers in LLAvatarListItem --- indra/newview/llavatarlistitem.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp index 5f3a6aee0b..e43761a395 100644 --- a/indra/newview/llavatarlistitem.cpp +++ b/indra/newview/llavatarlistitem.cpp @@ -129,8 +129,8 @@ LLAvatarListItem::~LLAvatarListItem() if (mAvatarId.notNull()) { LLAvatarTracker::instance().removeParticularFriendObserver(mAvatarId, this); - //LLAvatarTracker::instance().removeFriendPermissionObserver(mAvatarId, this); // CHUI Merge are these 2 lines needed? if so, comment - //LLAvatarPropertiesProcessor::getInstance()->removeObserver(mAvatarId, this); // may try to remove null observer + LLAvatarTracker::instance().removeFriendPermissionObserver(mAvatarId, this); + LLAvatarPropertiesProcessor::getInstance()->removeObserver(mAvatarId, this); // may try to remove null observer } if (mAvatarNameCacheConnection.connected())