summaryrefslogtreecommitdiff
path: root/indra/llui/llmenugl.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-09-22 12:27:26 -0700
committerRichard Linden <none@none>2010-09-22 12:27:26 -0700
commitf8a17515f592a1d759ca2c79f80b2ed032af2ebe (patch)
treef79ba81ed36c1cbf64ff923763bc9331df2f12fe /indra/llui/llmenugl.cpp
parent7648bb425ae106ce0268c7ff535b054de6f6a318 (diff)
EXP-109 WIP strip down main_view.xml
made menu keyboard access only work when menus are visible dummy widgets are now added with a parent view that is invisible popupview can now be default-built
Diffstat (limited to 'indra/llui/llmenugl.cpp')
-rw-r--r--indra/llui/llmenugl.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 900a814238..e179f63ee5 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -3066,7 +3066,10 @@ BOOL LLMenuBarGL::handleAcceleratorKey(KEY key, MASK mask)
mAltKeyTrigger = FALSE;
}
- if(!result && (key == KEY_F10 && mask == MASK_CONTROL) && !gKeyboard->getKeyRepeated(key))
+ if(!result
+ && (key == KEY_F10 && mask == MASK_CONTROL)
+ && !gKeyboard->getKeyRepeated(key)
+ && isInVisibleChain())
{
if (getHighlightedItem())
{