diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-05-02 16:36:02 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-05-02 16:36:02 -0700 |
| commit | cc7440d0853d269a5b955ab021db729ed5b6a92c (patch) | |
| tree | 12139acedc8bf22f95d4da0507ef84fb870590cd /indra/newview/llpersonfolderview.cpp | |
| parent | a73305c41d058fc755b824e5a9243afe43b424e1 (diff) | |
| parent | f849606399b902e71f4389ad1d7e0fc15f10d8b5 (diff) | |
Pull merge from viewer-fbc
Diffstat (limited to 'indra/newview/llpersonfolderview.cpp')
| -rw-r--r-- | indra/newview/llpersonfolderview.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
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) |