summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-05-18 10:18:03 -0400
committerLoren Shih <seraph@lindenlab.com>2010-05-18 10:18:03 -0400
commit46d799ab51c6fe577f443f294bde68c3096a26dd (patch)
treec5f592623911ad42520657e064e39add12082d33 /indra/llui
parentbc90ff8840d9fe69e658eb81d4a001b83deb9957 (diff)
parentb6ed10e8285e4abef4f14c618186984ef4b2cf7f (diff)
automated merge
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llmenugl.cpp18
1 files changed, 14 insertions, 4 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index e0e86ae228..b77126996e 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -3420,6 +3420,12 @@ BOOL LLMenuHolderGL::handleKey(KEY key, MASK mask, BOOL called_from_parent)
if (pMenu)
{
+ //eat TAB key - EXT-7000
+ if (key == KEY_TAB && mask == MASK_NONE)
+ {
+ return TRUE;
+ }
+
//handle ESCAPE and RETURN key
handled = LLPanel::handleKey(key, mask, called_from_parent);
if (!handled)
@@ -3726,10 +3732,14 @@ void LLContextMenuBranch::buildDrawLabel( void )
void LLContextMenuBranch::showSubMenu()
{
- S32 center_x;
- S32 center_y;
- localPointToScreen(getRect().getWidth(), getRect().getHeight() , &center_x, &center_y);
- mBranch->show( center_x, center_y);
+ LLMenuItemGL* menu_item = mBranch->getParentMenuItem();
+ if (menu_item != NULL && menu_item->getVisible())
+ {
+ S32 center_x;
+ S32 center_y;
+ localPointToScreen(getRect().getWidth(), getRect().getHeight() , &center_x, &center_y);
+ mBranch->show(center_x, center_y);
+ }
}
// onCommit() - do the primary funcationality of the menu item.