Two scrolllist update scraps find a home in this commit

indra/llui/llscrolllistcolumn.cpp

@@ -32,6 +32,7 @@
 #include "llbutton.h"
 #include "llkeyboard.h" // For gKeyboard
 #include "llresizebar.h"
+#include "llscrolllistctrl.h"
 #include "lluictrlfactory.h"
 
 const S32 MIN_COLUMN_WIDTH = 20;
@@ -136,6 +137,8 @@ LLView*	LLScrollColumnHeader::findSnapEdge(S32& new_edge_val, const LLCoordGL& m
 
 	LLRect snap_rect = getSnapRect();
 
+	mColumn->mParentCtrl->calcMaxContentWidth();
+
 	S32 snap_delta = mColumn->mMaxContentWidth - snap_rect.getWidth();
 
 	// x coord growing means column growing, so same signs mean we're going in right direction

indra/llui/llscrolllistctrl.cpp

@@ -1694,8 +1694,6 @@ BOOL LLScrollListCtrl::handleMouseDown(S32 x, S32 y, MASK mask)
 		mSelectionChanged = false;
 
 		handleClick(x, y, mask);
-
-		setFocus(TRUE);
 	}
 
 	return TRUE;