Commits

Merov Linden committed 4211262

VWR-29358 : Fix auto scroll to selection when the filter is active

Comments (0)

Files changed (1)

indra/newview/llfolderview.cpp

 		arrangeAll();
 	}
 
-	mNeedsAutoSelect = mFilter->hasFilterString() &&
-							!(gFocusMgr.childHasKeyboardFocus(this) || gFocusMgr.getMouseCapture());
-
-		
-	if (mFilter->isModified() && mFilter->isNotDefault())
-	{
-		mNeedsAutoSelect = TRUE;
-	}
+	BOOL filter_modified_and_active = mFilter->isModified() && mFilter->isNotDefault();
+	mNeedsAutoSelect = filter_modified_and_active &&
+						!(gFocusMgr.childHasKeyboardFocus(this) || gFocusMgr.getMouseCapture());
 	mFilter->clearModified();
 			
 	// filter to determine visibility before arranging