summaryrefslogtreecommitdiff
path: root/indra/llui/llmenugl.cpp
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-09-27 09:46:20 -0700
committerRichard Nelson <none@none>2010-09-27 09:46:20 -0700
commitad440a68bb6a481f17ea8b0cb8f3cecf37502d51 (patch)
treeb41c81b55f73b6ebd4ee0a14dd195c07d7ce2d40 /indra/llui/llmenugl.cpp
parentb25d969b61eb1e4f114ee0e632d1de9777780e9f (diff)
parent57b8571a8acd559b7a92c2d5ffbfe96b0c4b5b98 (diff)
merge
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 6d590cf54e..b1f4b362d5 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())
{