diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-01-06 16:13:44 -0800 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-01-06 16:13:44 -0800 |
commit | 35d0ac3ba5d57477020112004bcc965436284f72 (patch) | |
tree | 22b269db8fa2718101e6caaf682a351ca7dfbc69 /indra/newview | |
parent | 4be8577ec335f2c9e94e47302dbdd1723281718a (diff) |
menu holder, tooltip view and snapshot floater should be in main_view as added in main_view.xml
reviewed by richard
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llviewermenu.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 149b7a6d65..75aa3b64dc 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -437,19 +437,7 @@ void init_menus() gMenuBarView->setBackgroundColor( color ); gMenuHolder->addChild(gMenuBarView); - - // menu holder appears on top of menu bar so you can see the menu title - // flash when an item is triggered (the flash occurs in the holder) - gViewerWindow->getRootView()->addChild(gMenuHolder); - - // This removes tool tip view from main view and adds it - // to root view in front of menu holder. - // Otherwise tool tips for menu items would be overlapped by menu, since - // main view is behind of menu holder now. - gViewerWindow->getRootView()->addChild(gToolTipView); - - gViewerWindow->getRootView()->addChild(gSnapshotFloaterView); - + gViewerWindow->setMenuBackgroundColor(false, LLViewerLogin::getInstance()->isInProductionGrid()); |