From c7a2f5c4fba4ec8a782f96aa379b1372ed31a317 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 29 Jul 2011 17:29:02 -0700
Subject: EXP-1057 FIX Cursor doesn't go to the input field on the Find Floater
 due to lack of window focus also allow right clip to copy url from disabled
 address bar

---
 indra/llui/llcombobox.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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

diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index a4d1854bc8..cddda03faf 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -791,8 +791,10 @@ BOOL LLComboBox::handleKeyHere(KEY key, MASK mask)
 			return FALSE;
 		}
 		// if selection has changed, pop open list
-		else if (mList->getLastSelectedItem() != last_selected_item ||
-				(key == KEY_DOWN || key == KEY_UP) && !mList->isEmpty())
+		else if (mList->getLastSelectedItem() != last_selected_item 
+					|| ((key == KEY_DOWN || key == KEY_UP)
+						&& mList->getCanSelect()
+						&& !mList->isEmpty()))
 		{
 			showList();
 		}
-- 
cgit v1.2.3