From 4d72a6ea92d87822350be63e235b90daa4727d55 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 30 Apr 2013 18:17:20 -0700
Subject: ACME-252 Create AvatarFolderItemView: Fixed focusing issue when
 hovering over a people view and then selected an icon. Now when selecting the
 icon upon hover the corresponding people view will be selected as well.

---
 indra/newview/llpersonfolderview.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/llpersonfolderview.cpp b/indra/newview/llpersonfolderview.cpp
index 636d093e0e..ba1e9d20eb 100644
--- a/indra/newview/llpersonfolderview.cpp
+++ b/indra/newview/llpersonfolderview.cpp
@@ -64,7 +64,12 @@ BOOL LLPersonFolderView::handleMouseDown( S32 x, S32 y, MASK mask )
 		}
 	}
 
-	return LLFolderView::handleMouseDown(x, y, mask);
+	mKeyboardSelection = FALSE; 
+	mSearchString.clear();
+
+	LLEditMenuHandler::gEditMenuHandler = this;
+
+	return LLView::handleMouseDown( x, y, mask );
 }
 
 bool LLPersonFolderView::onConversationModelEvent(const LLSD &event)
-- 
cgit v1.2.3