From 821f998373c59dac9212f91ec967f39ed081663a Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Thu, 25 Jan 2007 00:18:16 +0000
Subject: merge -r 57058:57111 maintenance.

---
 indra/llui/llmenugl.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/llui')

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;
 	}
-- 
cgit v1.2.3