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

SL-16904 FIXED The viewer crashes after trying to empty trash containing calling card

master
Mnikolenko Productengine 2022-02-23 18:38:06 +02:00
parent 74641a1213
commit 8bd71fe6e8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llinventorybridge.cpp
View File

@ -5762,12 +5762,13 @@ LLCallingCardBridge::LLCallingCardBridge(LLInventoryPanel* inventory,
LLItemBridge(inventory, root, uuid)
{
mObserver = new LLCallingCardObserver(this);
LLAvatarTracker::instance().addParticularFriendObserver(getItem()->getCreatorUUID(), mObserver);
mCreatorUUID = getItem()->getCreatorUUID();
LLAvatarTracker::instance().addParticularFriendObserver(mCreatorUUID, mObserver);
}
LLCallingCardBridge::~LLCallingCardBridge()
{
LLAvatarTracker::instance().removeParticularFriendObserver(getItem()->getCreatorUUID(), mObserver);
LLAvatarTracker::instance().removeParticularFriendObserver(mCreatorUUID, mObserver);
delete mObserver;
}

1
indra/newview/llinventorybridge.h
View File

@ -457,6 +457,7 @@ public:
void checkSearchBySuffixChanges();
protected:
LLCallingCardObserver* mObserver;
LLUUID mCreatorUUID;
};
class LLNotecardBridge : public LLItemBridge