DEV-38131 "Drop down boxes with text entry ignore the text in the entry field"

reviewed by James

1 files changed, 12 insertions, 9 deletions

diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index 93d2b83c9f..b3c3a2e698 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -614,17 +614,20 @@ void LLComboBox::showList()
 
 void LLComboBox::hideList()
 {
-	// assert selection in list
-	mList->selectNthItem(mLastSelectedIndex);
+	if (mList->getVisible())
+	{
+		// assert selection in list
+		mList->selectNthItem(mLastSelectedIndex);
 
-	mButton->setToggleState(FALSE);
-	mList->setVisible(FALSE);
-	mList->mouseOverHighlightNthItem(-1);
+		mButton->setToggleState(FALSE);
+		mList->setVisible(FALSE);
+		mList->mouseOverHighlightNthItem(-1);
 
-	setUseBoundingRect(FALSE);
-	if( gFocusMgr.getTopCtrl() == this )
-	{
-		gFocusMgr.setTopCtrl(NULL);
+		setUseBoundingRect(FALSE);
+		if( gFocusMgr.getTopCtrl() == this )
+		{
+			gFocusMgr.setTopCtrl(NULL);
+		}
 	}
 }