Merge with tip

1 files changed, 4 insertions, 2 deletions

diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
index 64a4824a17..09124c3013 100644
--- a/indra/llui/llflatlistview.cpp
+++ b/indra/llui/llflatlistview.cpp
@@ -530,7 +530,8 @@ BOOL LLFlatListView::handleKeyHere(KEY key, MASK mask)
 			if ( !selectNextItemPair(true, reset_selection) && reset_selection)
 			{
 				// If case we are in accordion tab notify parent to go to the previous accordion
-				notifyParent(LLSD().with("action","select_prev"));
+				if(notifyParent(LLSD().with("action","select_prev")) > 0 )//message was processed
+					resetSelection();
 			}
 			break;
 		}
@@ -539,7 +540,8 @@ BOOL LLFlatListView::handleKeyHere(KEY key, MASK mask)
 			if ( !selectNextItemPair(false, reset_selection) && reset_selection)
 			{
 				// If case we are in accordion tab notify parent to go to the next accordion
-				notifyParent(LLSD().with("action","select_next"));
+				if( notifyParent(LLSD().with("action","select_next")) > 0 ) //message was processed
+					resetSelection();
 			}
 			break;
 		}