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/llcombobox.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index 8d8487f612..89ce68a32e 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -774,6 +774,12 @@ BOOL LLComboBox::handleKeyHere(KEY key, MASK mask)
 	BOOL result = FALSE;
 	if (hasFocus())
 	{
+		if (mList->getVisible() 
+			&& key == KEY_ESCAPE && mask == MASK_NONE)
+		{
+			hideList();
+			return TRUE;
+		}
 		//give list a chance to pop up and handle key
 		LLScrollListItem* last_selected_item = mList->getLastSelectedItem();
 		if (last_selected_item)
-- 
cgit v1.3