From 8bd71fe6e8a83fe90abf4dfe3d881c2915ce7479 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 23 Feb 2022 18:38:06 +0200
Subject: SL-16904 FIXED The viewer crashes after trying to empty trash
 containing calling card

---
 indra/newview/llinventorybridge.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llinventorybridge.cpp')

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;
 }
-- 
cgit v1.2.3