From e3d9c7d7bfa7722e22df9380baa4f044ac1be80f Mon Sep 17 00:00:00 2001
From: Martin Reddy <lynx@lindenlab.com>
Date: Mon, 5 Oct 2009 23:50:37 +0000
Subject: DEV-40819: Remove the "Debug > Consoles > Memory" menu entry when
this feature is disabled (the default) otherwise selecting it does nothing.
---
indra/newview/llviewermenu.cpp | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index d95992412f..3ecae2829d 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -567,6 +567,15 @@ void init_menus()
gAttachSubMenu = gMenuBarView->findChildMenuByName("Attach Object", TRUE);
gDetachSubMenu = gMenuBarView->findChildMenuByName("Detach Object", TRUE);
+#if !MEM_TRACK_MEM
+ // Don't display the Memory console menu if the feature is turned off
+ LLMenuItemCheckGL *memoryMenu = gMenuBarView->getChild<LLMenuItemCheckGL>("Memory", TRUE);
+ if (memoryMenu)
+ {
+ memoryMenu->setVisible(FALSE);
+ }
+#endif
+
gMenuBarView->createJumpKeys();
// Let land based option enable when parcel changes
--
cgit v1.2.3