Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/

indra/newview/llfloatertools.cpp

indra/newview/llpanelobjectinventory.cpp

indra/newview/skins/default/xui/en/floater_test_widgets.xml

indra/newview/skins/default/xui/en/floater_tools.xml

indra/newview/skins/default/xui/en/inspect_avatar.xml

indra/newview/skins/default/xui/en/widgets/button.xml

indra/newview/skins/default/xui/en/widgets/combo_box.xml

indra/newview/skins/default/xui/en/widgets/flyout_button.xml