From 73de4b4abed02bf6e0a3f22e307e087678e14ff6 Mon Sep 17 00:00:00 2001 From: Nicky Date: Tue, 17 Jan 2012 21:08:23 +0100 Subject: [PATCH] Enable viewer menu again (had left that out as one of the issues after merging up). --- indra/newview/llviewermenu.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 446226210d..8557da37dc 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -414,6 +414,8 @@ void set_underclothes_menu_options() void init_menus() { + S32 top = gViewerWindow->getRootView()->getRect().getHeight(); + // Initialize actions initialize_menus(); @@ -506,7 +508,7 @@ void init_menus() */ gMenuBarView = LLUICtrlFactory::getInstance()->createFromFile("menu_viewer.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance()); - // gMenuBarView->setRect(LLRect(0, top, 0, top - MENU_BAR_HEIGHT)); ND_MERGE + gMenuBarView->setRect(LLRect(0, top, 0, top - MENU_BAR_HEIGHT)); // If we are not in production, use a different color to make it apparent. // ONLY change the color IF we are in beta. Otherwise leave it alone so it can use the skinned color. -Zi