summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRye Mutt <rye@alchemyviewer.org>2024-07-24 12:58:01 -0400
committerRye Mutt <rye@alchemyviewer.org>2024-07-25 08:45:53 -0400
commit63d32e8b32b99d511c557f4fd390d974f3672ab7 (patch)
tree23ee7ed58e1511aada1efe1b48f52c021266dd21
parent24fb96c9af5cb2d566617a8bef827af29b1d8f58 (diff)
Fix accidental memory leak from gSLMMenuUpdater
-rw-r--r--indra/newview/llviewermenu.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 4fcfe1a120..888b607bfb 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -2795,6 +2795,9 @@ class LLAdminOnSaveState: public view_listener_t
//-----------------------------------------------------------------------------
void cleanup_menus()
{
+ delete gSLMMenuUpdater;
+ gSLMMenuUpdater = nullptr;
+
delete gMenuParcelObserver;
gMenuParcelObserver = NULL;
@@ -2811,7 +2814,7 @@ void cleanup_menus()
gMenuAttachmentSelf = NULL;
delete gMenuAttachmentOther;
- gMenuAttachmentSelf = NULL;
+ gMenuAttachmentOther = NULL;
delete gMenuLand;
gMenuLand = NULL;