diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-02-23 16:04:49 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-02-23 16:04:49 -0600 |
| commit | 65a28c5d7dc54dc9e263da4b19229fb5f86a1c62 (patch) | |
| tree | 509d7c78a49ef9b9bc95c9b61eabbad8e33b7d64 | |
| parent | 8ffe3b7b3047381f9c17d0f09757e921ffc246cb (diff) | |
| parent | 8bd71fe6e8a83fe90abf4dfe3d881c2915ce7479 (diff) | |
Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546
| -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 |