From 5456af4c8ce8c2bef7d544cd8a928ea399832756 Mon Sep 17 00:00:00 2001 From: Rye Mutt Date: Wed, 19 Oct 2022 16:28:34 -0400 Subject: Fix various menu leaks and lazy creation in chiclets, bump floater, media controls, and the mini map --- indra/newview/llnetmap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llnetmap.h') diff --git a/indra/newview/llnetmap.h b/indra/newview/llnetmap.h index 1f7e7d68c6..0adb78d2c8 100644 --- a/indra/newview/llnetmap.h +++ b/indra/newview/llnetmap.h @@ -134,7 +134,7 @@ private: void handleZoom(const LLSD& userdata); void handleStopTracking (const LLSD& userdata); - LLMenuGL* mPopupMenu; + LLHandle mPopupMenuHandle; uuid_vec_t gmSelected; }; -- cgit v1.2.3 From 58d62656620be44360861ef60630da1845c307be Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Thu, 20 Oct 2022 22:52:41 +0300 Subject: SL-18423 Post-merge: restore RyeMutt's fix from SL-18412 --- indra/newview/llnetmap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llnetmap.h') diff --git a/indra/newview/llnetmap.h b/indra/newview/llnetmap.h index 20d0828ab1..75c1abc4ed 100644 --- a/indra/newview/llnetmap.h +++ b/indra/newview/llnetmap.h @@ -162,7 +162,7 @@ private: void setMapOrientation(const LLSD& userdata); void popupShowAboutLand(const LLSD& userdata); - LLMenuGL* mPopupMenu; + LLHandle mPopupMenuHandle; uuid_vec_t gmSelected; }; -- cgit v1.2.3