From 80be4c1d2d73982ea2df6dd7ef3fc3465416c882 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Tue, 12 Aug 2008 17:29:50 +0000
Subject: QAR-767 Combined maint-render-7 and maint-viewer-9 merge merge
 release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated

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

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

diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index fba0984dce..3237ef8e27 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -3902,6 +3902,13 @@ BOOL LLMenuBarGL::handleKeyHere(KEY key, MASK mask)
 	{
 		mAltKeyTrigger = FALSE;
 	}
+	
+	if (key == KEY_ESCAPE && mask == MASK_NONE)
+	{
+		LLMenuGL::setKeyboardMode(FALSE);
+		// if any menus are visible, this will return TRUE, stopping further processing of ESCAPE key
+		return LLMenuGL::sMenuContainer->hideMenus();
+	}
 
 	// before processing any other key, check to see if ALT key has triggered menu access
 	checkMenuTrigger();
-- 
cgit v1.2.3