livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable viewer menu again (had left that out as one of the issues after merging up).

meow-7.2.2
Nicky 2012-01-17 21:08:23 +01:00
parent 3917ad7031
commit 73de4b4abe
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewermenu.cpp
View File

@ -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<LLMenuBarGL>("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