diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-18 15:23:33 -0500 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-18 15:23:33 -0500 |
commit | 7836bba2dcaf47e2ccb43185507215c0cea9f76f (patch) | |
tree | 60f362913cb49d150637669d2b762156cdfe8a63 /indra/newview/llviewermenu.cpp | |
parent | fd71944170e69b0fc47b45c385c33ef7acf4cafb (diff) | |
parent | 8246111b12025bfb5864af354632737f67c32bd1 (diff) |
merging latest PE changes into viewer-2-0
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r-- | indra/newview/llviewermenu.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 791e3a1948..fb62392805 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -439,6 +439,12 @@ void init_menus() // 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->setMenuBackgroundColor(false, LLViewerLogin::getInstance()->isInProductionGrid()); |