diff options
author | Jacek Antonelli | 2008-08-15 23:44:48 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:48 -0500 |
commit | 9b4f54c826ffa4f94efa866068c9d6ecdfb4b424 (patch) | |
tree | 2f8ae193ab487088962e628f1ee9dee2f5901f01 /linden/indra/llui | |
parent | Second Life viewer sources 1.13.2.12 (diff) | |
download | meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.zip meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.tar.gz meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.tar.bz2 meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.tar.xz |
Second Life viewer sources 1.13.2.15
Diffstat (limited to 'linden/indra/llui')
-rw-r--r-- | linden/indra/llui/llmenugl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/llui/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp index 6d70fd1..97069fa 100644 --- a/linden/indra/llui/llmenugl.cpp +++ b/linden/indra/llui/llmenugl.cpp | |||
@@ -491,6 +491,7 @@ BOOL LLMenuItemGL::handleMouseUp( S32 x, S32 y, MASK ) | |||
491 | } | 491 | } |
492 | } | 492 | } |
493 | 493 | ||
494 | |||
494 | void LLMenuItemGL::draw( void ) | 495 | void LLMenuItemGL::draw( void ) |
495 | { | 496 | { |
496 | // *FIX: This can be optimized by using switches. Want to avoid | 497 | // *FIX: This can be optimized by using switches. Want to avoid |
@@ -4123,7 +4124,7 @@ BOOL LLMenuBarGL::handleAcceleratorKey(KEY key, MASK mask) | |||
4123 | 4124 | ||
4124 | BOOL LLMenuBarGL::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent) | 4125 | BOOL LLMenuBarGL::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent) |
4125 | { | 4126 | { |
4126 | if(key == KEY_ALT) | 4127 | if(key == KEY_ALT && !gKeyboard->getKeyRepeated(key) && LLUI::sConfigGroup->getBOOL("UseAltKeyForMenus")) |
4127 | { | 4128 | { |
4128 | mAltKeyTrigger = TRUE; | 4129 | mAltKeyTrigger = TRUE; |
4129 | } | 4130 | } |