Sanity checks, bugfixes, crashfixes, and misc tweaks snagged from snowglobe.

indra/newview/llcolorswatch.cpp

@@ -193,6 +193,9 @@ BOOL LLColorSwatchCtrl::handleMouseUp(S32 x, S32 y, MASK mask)
 			llassert(getEnabled());
 			llassert(getVisible());
 
+			// Focus the widget now in order to return the focus
+			// after the color picker is closed.
+			setFocus(TRUE);
 			showPicker(FALSE);
 		}
 	}