summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMartin Reddy <lynx@lindenlab.com>2009-10-05 23:50:37 +0000
committerMartin Reddy <lynx@lindenlab.com>2009-10-05 23:50:37 +0000
commite3d9c7d7bfa7722e22df9380baa4f044ac1be80f (patch)
treee992ca9a3040644e5f688fda336cc8955467c04b /indra/newview
parent1b3c6cc3621c2f49e8b0b0d2b06462279622e169 (diff)
DEV-40819: Remove the "Debug > Consoles > Memory" menu entry when this
feature is disabled (the default) otherwise selecting it does nothing.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewermenu.cpp9
1 files changed, 9 insertions, 0 deletions
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