diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-01-25 00:18:16 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-01-25 00:18:16 +0000 |
| commit | 821f998373c59dac9212f91ec967f39ed081663a (patch) | |
| tree | 3ebff489abf57a57670eb2008d13683fdc92e23b /indra/llui | |
| parent | ad94bca0d273869d6358719f4dbd515a905acd26 (diff) | |
merge -r 57058:57111 maintenance.
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llmenugl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 7d2df53f9b..f574d981ef 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -472,6 +472,7 @@ BOOL LLMenuItemGL::handleMouseUp( S32 x, S32 y, MASK ) } } + void LLMenuItemGL::draw( void ) { // *FIX: This can be optimized by using switches. Want to avoid @@ -4104,7 +4105,7 @@ BOOL LLMenuBarGL::handleAcceleratorKey(KEY key, MASK mask) BOOL LLMenuBarGL::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent) { - if(key == KEY_ALT) + if(key == KEY_ALT && !gKeyboard->getKeyRepeated(key) && LLUI::sConfigGroup->getBOOL("UseAltKeyForMenus")) { mAltKeyTrigger = TRUE; } |