livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Crashfix: Properly clean up observers in LLAvatarListItem

meow-7.2.2
Ansariel 2013-07-07 23:48:59 +02:00
parent 82b9aff6fc
commit 61d6beb56c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llavatarlistitem.cpp
View File

@ -129,8 +129,8 @@ LLAvatarListItem::~LLAvatarListItem()
if (mAvatarId.notNull())
{
LLAvatarTracker::instance().removeParticularFriendObserver(mAvatarId, this);
//LLAvatarTracker::instance().removeFriendPermissionObserver(mAvatarId, this); //<FS:TM> 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())