diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-10-19 23:53:53 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-10-19 23:53:53 +0300 |
| commit | f0cd5407c429f1033ede01e96a107daef70814fd (patch) | |
| tree | 3d10de84512f0e6a4ad663c7fbee5dc23317130c /indra/llui/lltextbase.cpp | |
| parent | 46427eefd4d27704397f4fe3cf3bc9d29946c1b2 (diff) | |
| parent | 5456af4c8ce8c2bef7d544cd8a928ea399832756 (diff) | |
SL-18412 Merge remote-tracking branch 'RyeMutt/viewer/menu-leaks' into DRTVWR-570-maint-Q
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 7e4aaa53bf..fcfdd64e6a 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -273,6 +273,12 @@ LLTextBase::LLTextBase(const LLTextBase::Params &p) LLTextBase::~LLTextBase() { mSegments.clear(); + LLContextMenu* menu = static_cast<LLContextMenu*>(mPopupMenuHandle.get()); + if (menu) + { + menu->die(); + mPopupMenuHandle.markDead(); + } delete mURLClickSignal; delete mIsFriendSignal; delete mIsObjectBlockedSignal; |