From d373dcc7cbed5fdea72c6b71a5594e4e85549b43 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Fri, 20 Jul 2007 20:38:05 +0000
Subject: svn merge -r 64548:64837
 svn+ssh://svn/svn/linden/branches/maintenance into release * WARNING *: 
 maintenance r64837 is not the last rev to use in the next merge. use r65269

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

(limited to 'indra/llui/llmenugl.cpp')

diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 5857f49a3e..d7ccfe1daa 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -2945,6 +2945,12 @@ BOOL LLMenuGL::handleKey( KEY key, MASK mask, BOOL called_from_parent )
 
 BOOL LLMenuGL::handleAcceleratorKey(KEY key, MASK mask)
 {
+	// don't handle if not enabled
+	if(!mEnabled)
+	{
+		return FALSE;
+	}
+
 	// Pass down even if not visible
 	item_list_t::iterator item_iter;
 	for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
-- 
cgit v1.2.3