[sldev] Destructor fails to clean up menus / VWR-809

Nicholaz Beresford nicholaz at blueflash.cc
Tue May 22 01:28:53 PDT 2007


The destructor in llviewermenu.cpp fails to delete the global
items (menu pointers, pie-menus, etc.) which were created during
startup.

https://jira.secondlife.com/browse/VWR-809

Patch atached
-------------- next part --------------
--- linden-orig/indra/newview/llviewermenu.cpp	2007-05-14 16:47:26.000000000 +0200
+++ linden/indra/newview/llviewermenu.cpp	2007-05-22 10:28:23.953125000 +0200
@@ -1435,6 +1435,41 @@
 {
 	delete gMenuParcelObserver;
 	gMenuParcelObserver = NULL;
+
+	// PATCH [Nicholaz Beresford] 
+	//
+	// VWR-809
+
+	// delete all menus (reverse order of creation)
+
+	// delete pie menus
+	delete gPieSelf;
+	gPieSelf= NULL;
+
+	delete gPieAvatar;
+	gPieAvatar= NULL;
+
+	delete gPieObject;
+	gPieObject= NULL;
+
+	delete gPieAttachment;
+	gPieAttachment= NULL;
+
+	delete gPieLand;
+	gPieLand= NULL;
+
+	
+	// delete other menus
+	delete gMenuBarView;
+	gMenuBarView= NULL;
+
+	delete gPopupMenuView;
+	gPopupMenuView= NULL;
+
+	delete gMenuHolder;
+	gMenuHolder= NULL;
+	//
+	// ~PATCH [Nicholaz Beresford]
 }
 
 //-----------------------------------------------------------------------------


More information about the SLDev mailing list