diff options
Diffstat (limited to 'linden/indra/newview/llviewermenu.cpp')
-rw-r--r-- | linden/indra/newview/llviewermenu.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 1fe2dde..ac16dbc 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp | |||
@@ -651,20 +651,8 @@ void init_menus() | |||
651 | color = gColors.getColor( "MenuPopupBgColor" ); | 651 | color = gColors.getColor( "MenuPopupBgColor" ); |
652 | gPopupMenuView->setBackgroundColor( color ); | 652 | gPopupMenuView->setBackgroundColor( color ); |
653 | 653 | ||
654 | // If we are not in production, use a different color to make it apparent. | ||
655 | if (LLViewerLogin::getInstance()->isInProductionGrid()) | ||
656 | { | ||
657 | color = gColors.getColor( "MenuBarBgColor" ); | ||
658 | } | ||
659 | else | ||
660 | { | ||
661 | color = gColors.getColor( "MenuNonProductionBgColor" ); | ||
662 | } | ||
663 | gMenuBarView = (LLMenuBarGL*)LLUICtrlFactory::getInstance()->buildMenu("menu_viewer.xml", gMenuHolder); | 654 | gMenuBarView = (LLMenuBarGL*)LLUICtrlFactory::getInstance()->buildMenu("menu_viewer.xml", gMenuHolder); |
664 | gMenuBarView->setRect(LLRect(0, top, 0, top - MENU_BAR_HEIGHT)); | 655 | gMenuBarView->setRect(LLRect(0, top, 0, top - MENU_BAR_HEIGHT)); |
665 | |||
666 | // main menu colors | ||
667 | gMenuBarView->setBackgroundColor(color); | ||
668 | 656 | ||
669 | // gMenuBarView->setItemVisible("Tools", FALSE); | 657 | // gMenuBarView->setItemVisible("Tools", FALSE); |
670 | gMenuBarView->arrange(); | 658 | gMenuBarView->arrange(); |
@@ -675,8 +663,7 @@ void init_menus() | |||
675 | // flash when an item is triggered (the flash occurs in the holder) | 663 | // flash when an item is triggered (the flash occurs in the holder) |
676 | gViewerWindow->getRootView()->addChild(gMenuHolder); | 664 | gViewerWindow->getRootView()->addChild(gMenuHolder); |
677 | 665 | ||
678 | gViewerWindow->setMenuBackgroundColor(false, | 666 | gViewerWindow->setMenuBackgroundColor(false, LLViewerLogin::getInstance()->isInProductionGrid()); |
679 | LLViewerLogin::getInstance()->isInProductionGrid()); | ||
680 | 667 | ||
681 | // Assume L$10 for now, the server will tell us the real cost at login | 668 | // Assume L$10 for now, the server will tell us the real cost at login |
682 | std::string fee = gHippoGridManager->getConnectedGrid()->getCurrencySymbol() + "10"; | 669 | std::string fee = gHippoGridManager->getConnectedGrid()->getCurrencySymbol() + "10"; |
@@ -725,8 +712,6 @@ void init_menus() | |||
725 | LLRect menuBarRect = gLoginMenuBarView->getRect(); | 712 | LLRect menuBarRect = gLoginMenuBarView->getRect(); |
726 | gLoginMenuBarView->setRect(LLRect(menuBarRect.mLeft, menuBarRect.mTop, gViewerWindow->getRootView()->getRect().getWidth() - menuBarRect.mLeft, menuBarRect.mBottom)); | 713 | gLoginMenuBarView->setRect(LLRect(menuBarRect.mLeft, menuBarRect.mTop, gViewerWindow->getRootView()->getRect().getWidth() - menuBarRect.mLeft, menuBarRect.mBottom)); |
727 | 714 | ||
728 | gLoginMenuBarView->setBackgroundColor( color ); | ||
729 | |||
730 | gMenuHolder->addChild(gLoginMenuBarView); | 715 | gMenuHolder->addChild(gLoginMenuBarView); |
731 | } | 716 | } |
732 | 717 | ||