diff options
author | McCabe Maxsted | 2011-05-27 20:25:26 -0700 |
---|---|---|
committer | Jacek Antonelli | 2011-06-02 23:00:45 -0500 |
commit | 5796f8e8bfb1809755327d1c51ac66c6509370a5 (patch) | |
tree | 1b1c752c6d038e6231c5f85d8fc111e0ba2426da /linden/indra/newview/llviewermenu.cpp | |
parent | Fix for #903 ATI star issue, ported from Phoenix via Shoytl and Singularity (diff) | |
download | meta-impy-5796f8e8bfb1809755327d1c51ac66c6509370a5.zip meta-impy-5796f8e8bfb1809755327d1c51ac66c6509370a5.tar.gz meta-impy-5796f8e8bfb1809755327d1c51ac66c6509370a5.tar.bz2 meta-impy-5796f8e8bfb1809755327d1c51ac66c6509370a5.tar.xz |
Fixed #875 by removing menu border introduced in 84ba6c13
(cherry picked from commit bcfe397d0f3ab2bd8df3f8055f089824dd082bf4)
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewermenu.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index c8adf7b..1fe2dde 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp | |||
@@ -564,7 +564,7 @@ void pre_init_menus() | |||
564 | // static information | 564 | // static information |
565 | LLColor4 color; | 565 | LLColor4 color; |
566 | color = gColors.getColor( "MenuDefaultBgColor" ); | 566 | color = gColors.getColor( "MenuDefaultBgColor" ); |
567 | LLMenuGL::setDefaultBackgroundColor( color ); | 567 | LLMenuGL::setDefaultBackgroundColor(color); |
568 | color = gColors.getColor( "MenuItemEnabledColor" ); | 568 | color = gColors.getColor( "MenuItemEnabledColor" ); |
569 | LLMenuItemGL::setEnabledColor( color ); | 569 | LLMenuItemGL::setEnabledColor( color ); |
570 | color = gColors.getColor( "MenuItemDisabledColor" ); | 570 | color = gColors.getColor( "MenuItemDisabledColor" ); |
@@ -662,7 +662,9 @@ void init_menus() | |||
662 | } | 662 | } |
663 | gMenuBarView = (LLMenuBarGL*)LLUICtrlFactory::getInstance()->buildMenu("menu_viewer.xml", gMenuHolder); | 663 | gMenuBarView = (LLMenuBarGL*)LLUICtrlFactory::getInstance()->buildMenu("menu_viewer.xml", gMenuHolder); |
664 | gMenuBarView->setRect(LLRect(0, top, 0, top - MENU_BAR_HEIGHT)); | 664 | gMenuBarView->setRect(LLRect(0, top, 0, top - MENU_BAR_HEIGHT)); |
665 | gMenuBarView->setBackgroundColor( color ); | 665 | |
666 | // main menu colors | ||
667 | gMenuBarView->setBackgroundColor(color); | ||
666 | 668 | ||
667 | // gMenuBarView->setItemVisible("Tools", FALSE); | 669 | // gMenuBarView->setItemVisible("Tools", FALSE); |
668 | gMenuBarView->arrange(); | 670 | gMenuBarView->arrange(); |