diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-02-23 18:38:06 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-02-23 18:38:06 +0200 |
| commit | 8bd71fe6e8a83fe90abf4dfe3d881c2915ce7479 (patch) | |
| tree | 1b3098fd7d7c764305de100fe199ad2017024b56 /indra | |
| parent | 74641a121316a13e106d525fb1684c517791766d (diff) | |
SL-16904 FIXED The viewer crashes after trying to empty trash containing calling card
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llinventorybridge.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 3609c5e457..c1143c9011 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -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; } diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index c21bfbd02d..0b0ef273e1 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -457,6 +457,7 @@ public: void checkSearchBySuffixChanges(); protected: LLCallingCardObserver* mObserver; + LLUUID mCreatorUUID; }; class LLNotecardBridge : public LLItemBridge |