From 36fccc3888c5dc318a8a235da8a5cae4faeb637d Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 30 Apr 2008 23:30:09 +0000
Subject: svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r
 84579:85724 maint-ui-11-qa).

---
 indra/newview/llfolderview.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/llfolderview.cpp')

diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 087452919e..075ed81a53 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -3144,6 +3144,10 @@ void LLFolderView::draw()
 	{
 		closeAutoOpenedFolders();
 	}
+	if(gViewerWindow->hasKeyboardFocus(this) && !getVisible())
+	{
+		gViewerWindow->setKeyboardFocus( NULL );
+	}
 
 	// while dragging, update selection rendering to reflect single/multi drag status
 	if (LLToolDragAndDrop::getInstance()->hasMouseCapture())
-- 
cgit v1.2.3